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

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

4 files changed, 34 insertions, 2 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d18c83088a..d8f8297d29 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -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
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 57c6eac920..462ce43c3f 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -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"));
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 6f6e402883..73f0c5bf43 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -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"));
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 5c272c5f74..e805d1323f 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -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