Pass the env argument to bonobo_control_set_property ().

2002-12-06  Hans Petter Jansson  <hpj@ximian.com>

	* gui/component-factory.c (): Pass the env argument to
	bonobo_control_set_property ().

	* gui/e-meeting-model.c (class_init): We're no longer derived from
	GtkObject, so use GObject class methods instead. destroy->finalize.
	(destroy): Zapped.
	(finalize): Implement based on old destroy ().

svn path=/trunk/; revision=19048

4 files changed, 21 insertions, 10 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index b4035b3d53..fcee434d7d 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,15 @@
 2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
 
+	* gui/component-factory.c (): Pass the env argument to
+	bonobo_control_set_property ().
+
+	* gui/e-meeting-model.c (class_init): We're no longer derived from
+	GtkObject, so use GObject class methods instead. destroy->finalize.
+	(destroy): Zapped.
+	(finalize): Implement based on old destroy ().
+
+2002-12-06  Hans Petter Jansson  <hpj@ximian.com>
+
 	* cal-client/cal-client.c (cal_client_open_status_enum_get_type):
 	Create a non-abstract enumeration type derived from GEnum.
 	(cal_client_set_mode_status_enum_get_type): Ditto.
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 79ae0565fa..ff13791617 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -130,9 +130,9 @@ create_view (EvolutionShellComponent *shell_component,
 		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
 	}
 
-	bonobo_control_set_property (control, "folder_uri", TC_CORBA_string, physical_uri, NULL);
+	bonobo_control_set_property (control, NULL, "folder_uri", TC_CORBA_string, physical_uri, NULL);
 	if (type_is_calendar (type) && *view_info)
-		bonobo_control_set_property (control, "view", TC_CORBA_string, view_info, NULL);
+		bonobo_control_set_property (control, NULL, "view", TC_CORBA_string, view_info, NULL);
 
 	*control_return = control;
 
diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c
index 79ae0565fa..ff13791617 100644
--- a/calendar/gui/component-factory.c
+++ b/calendar/gui/component-factory.c
@@ -130,9 +130,9 @@ create_view (EvolutionShellComponent *shell_component,
 		return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;
 	}
 
-	bonobo_control_set_property (control, "folder_uri", TC_CORBA_string, physical_uri, NULL);
+	bonobo_control_set_property (control, NULL, "folder_uri", TC_CORBA_string, physical_uri, NULL);
 	if (type_is_calendar (type) && *view_info)
-		bonobo_control_set_property (control, "view", TC_CORBA_string, view_info, NULL);
+		bonobo_control_set_property (control, NULL, "view", TC_CORBA_string, view_info, NULL);
 
 	*control_return = control;
 
diff --git a/calendar/gui/e-meeting-model.c b/calendar/gui/e-meeting-model.c
index 7ae89e06c6..0dde3a6850 100644
--- a/calendar/gui/e-meeting-model.c
+++ b/calendar/gui/e-meeting-model.c
@@ -109,7 +109,7 @@ struct _EMeetingModelQueueData {
 
 static void class_init	(EMeetingModelClass	 *klass);
 static void init	(EMeetingModel		 *model);
-static void destroy	(GtkObject *obj);
+static void finalize	(GObject *obj);
 
 static void refresh_queue_add (EMeetingModel *im, int row,
 			       EMeetingTime *start,
@@ -621,15 +621,15 @@ free_duplicated_key (void *key, gpointer data)
 static void
 class_init (EMeetingModelClass *klass)
 {
-	GtkObjectClass *object_class;
+	GObjectClass *gobject_class;
 	ETableModelClass *etm_class;
 	
-	object_class = GTK_OBJECT_CLASS (klass);
+	gobject_class = G_OBJECT_CLASS (klass);
 	etm_class = E_TABLE_MODEL_CLASS (klass);
 
 	parent_class = g_type_class_peek_parent (klass);
 
-	object_class->destroy = destroy;
+	gobject_class->finalize = finalize;
 
 	etm_class->column_count = column_count;
 	etm_class->row_count = row_count;
@@ -685,7 +685,7 @@ init (EMeetingModel *im)
 }
 
 static void
-destroy (GtkObject *obj)
+finalize (GObject *obj)
 {
 	EMeetingModel *im = E_MEETING_MODEL (obj);
 	EMeetingModelPrivate *priv;
@@ -699,7 +699,8 @@ destroy (GtkObject *obj)
 	g_ptr_array_free (priv->attendees, TRUE); 
 
 	for (l = priv->tables; l != NULL; l = l->next)
-		gtk_signal_disconnect_by_data (GTK_OBJECT (l->data), im);
+		g_signal_handlers_disconnect_matched (G_OBJECT (l->data), G_SIGNAL_MATCH_DATA,
+						      0, 0, NULL, NULL, im);
 	g_list_free (priv->tables);
 	
 	if (priv->client != NULL)