callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Appease the compiler. (gnome_calendar_update_paned_quanta): Don't actually

Browse Source 
2003-02-23  Hans Petter Jansson  <hpj@ximan.com>

	* gui/gnome-cal.c (backend_died_cb): Appease the compiler.
	(gnome_calendar_update_paned_quanta): Don't actually try to set
	the quantum properties. The quantum code should probably go away
	entirely now that the panes update during resize, but let's keep
	it around for a bit more.

	* gui/dialogs/event-editor.c (event_editor_construct): Ref & sink
	the pages.

	* gui/dialogs/task-editor.c (task_editor_construct): Ref & sink
	the pages.

svn path=/trunk/; revision=20011
This commit is contained in:
Hans Petter Jansson
2003-02-24 00:57:57 +00:00
committed by Hans Petter
parent 4543bfd994
commit 1d89cb7a9b
4 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/ChangeLog
View File

@ -1,3 +1,17 @@
2003-02-23 Hans Petter Jansson <hpj@ximan.com>
* gui/gnome-cal.c (backend_died_cb): Appease the compiler.
(gnome_calendar_update_paned_quanta): Don't actually try to set
the quantum properties. The quantum code should probably go away
entirely now that the panes update during resize, but let's keep
it around for a bit more.
* gui/dialogs/event-editor.c (event_editor_construct): Ref & sink
the pages.
* gui/dialogs/task-editor.c (task_editor_construct): Ref & sink
the pages.
2003-02-23 Hans Petter Jansson <hpj@ximian.com>
* gui/cal-search-bar.c (make_suboptions): Eliminate

10
calendar/gui/dialogs/event-editor.c
View File

@ -192,26 +192,36 @@ event_editor_construct (EventEditor *ee, CalClient *client)
priv = ee->priv;
priv->event_page = event_page_new ();
g_object_ref (priv->event_page);
gtk_object_sink (GTK_OBJECT (priv->event_page));
comp_editor_append_page (COMP_EDITOR (ee),
COMP_EDITOR_PAGE (priv->event_page),
_("Appointment"));
priv->alarm_page = alarm_page_new ();
g_object_ref (priv->alarm_page);
gtk_object_sink (GTK_OBJECT (priv->alarm_page));
comp_editor_append_page (COMP_EDITOR (ee),
COMP_EDITOR_PAGE (priv->alarm_page),
_("Reminder"));
priv->recur_page = recurrence_page_new ();
g_object_ref (priv->recur_page);
gtk_object_sink (GTK_OBJECT (priv->recur_page));
comp_editor_append_page (COMP_EDITOR (ee),
COMP_EDITOR_PAGE (priv->recur_page),
_("Recurrence"));
priv->sched_page = schedule_page_new (priv->model);
g_object_ref (priv->sched_page);
gtk_object_sink (GTK_OBJECT (priv->sched_page));
comp_editor_append_page (COMP_EDITOR (ee),
COMP_EDITOR_PAGE (priv->sched_page),
_("Scheduling"));
priv->meet_page = meeting_page_new (priv->model, client);
g_object_ref (priv->meet_page);
gtk_object_sink (GTK_OBJECT (priv->meet_page));
comp_editor_append_page (COMP_EDITOR (ee),
COMP_EDITOR_PAGE (priv->meet_page),
_("Meeting"));

6
calendar/gui/dialogs/task-editor.c
View File

@ -181,16 +181,22 @@ task_editor_construct (TaskEditor *te, CalClient *client)
priv = te->priv;
priv->task_page = task_page_new ();
g_object_ref (priv->task_page);
gtk_object_sink (GTK_OBJECT (priv->task_page));
comp_editor_append_page (COMP_EDITOR (te),
COMP_EDITOR_PAGE (priv->task_page),
_("Basic"));
priv->task_details_page = task_details_page_new ();
g_object_ref (priv->task_details_page);
gtk_object_sink (GTK_OBJECT (priv->task_details_page));
comp_editor_append_page (COMP_EDITOR (te),
COMP_EDITOR_PAGE (priv->task_details_page),
_("Details"));
priv->meet_page = meeting_page_new (priv->model, client);
g_object_ref (priv->meet_page);
gtk_object_sink (GTK_OBJECT (priv->meet_page));
comp_editor_append_page (COMP_EDITOR (te),
COMP_EDITOR_PAGE (priv->meet_page),
_("Assignment"));

6
calendar/gui/gnome-cal.c
View File

@ -1767,8 +1767,10 @@ backend_died_cb (CalClient *client, gpointer data)
uristr);
calendar_model_set_status_message (
e_calendar_table_get_model (E_CALENDAR_TABLE (priv->todo)), NULL);
} else
} else {
message = NULL;
g_assert_not_reached ();
}
gnome_error_dialog_parented (message, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));
g_free (message);
@ -2666,7 +2668,7 @@ gnome_calendar_update_paned_quanta (GnomeCalendar *gcal)
months as will fit. But for that to work nicely the EPaned should
resize the widgets as the bar is dragged. Otherwise the user has
to mess around to get the number of months that they want. */
#if 1
#if 0
g_object_set (G_OBJECT (priv->hpane), "quantum", (guint) col_width, NULL);
g_object_set (G_OBJECT (priv->vpane), "quantum", (guint) row_height, NULL);
#endif