From 8f7b3fabe5f53b57f9d6f6df048a9faf23e0837a Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 11 Nov 2002 21:19:24 +0000 Subject: gtk_widget_destroy() instead of gtk_object_destroy(). * e-summary-factory.c (control_destroy_cb): gtk_widget_destroy() instead of gtk_object_destroy(). (e_summary_factory_new_control): Likewise. * e-summary-calendar.c: Use g_object_ref()/g_object_unref() instead of gtk_object_ref()/gtk_object_unref(). * e-summary-preferences.c: Likewise. * e-summary-shown.c: Likewise. * e-summary-table.c: Likewise. * e-summary-tasks.c: Likewise. * e-summary.c: Likewise. * e-summary-preferences.c (e_summary_preferences_make_mail_table): g_object_set_data() instead of gtk_object_set_data(). (make_property_dialog): g_object_get_data() instead of gtk_object_get_data(). (get_folders_from_view): Likewise. * component-factory.c (create_view): Use evolution_shell_client_corba_objref() instead of bonobo_object_corba_objref() on the EvolutionShellClient object. Also, use g_object_get_data() instead of gtk_object_get_data(). (owner_set_cb): Likewise. (create_component): Use g_object_set_data() instead of gtk_object_set_data(). svn path=/trunk/; revision=18710 --- my-evolution/e-summary-preferences.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'my-evolution/e-summary-preferences.c') diff --git a/my-evolution/e-summary-preferences.c b/my-evolution/e-summary-preferences.c index 3f11ae4b4e..edbda8f135 100644 --- a/my-evolution/e-summary-preferences.c +++ b/my-evolution/e-summary-preferences.c @@ -1038,8 +1038,7 @@ make_property_dialog (PropertyData *pd) mail->storage_set_view = glade_xml_get_widget (pd->xml, "mail-custom"); g_return_val_if_fail (mail->storage_set_view != NULL, FALSE); - listener = gtk_object_get_data (GTK_OBJECT (mail->storage_set_view), - "listener"); + listener = g_object_get_data (G_OBJECT (mail->storage_set_view), "listener"); gtk_signal_connect (GTK_OBJECT (listener), "folder-toggled", GTK_SIGNAL_FUNC (storage_set_changed), pd); @@ -1192,9 +1191,8 @@ free_property_dialog (PropertyData *pd) g_free (pd->calendar); } - if (pd->xml) { - gtk_object_unref (GTK_OBJECT (pd->xml)); - } + if (pd->xml) + g_object_unref (pd->xml); g_free (pd); } @@ -1287,8 +1285,8 @@ e_summary_preferences_make_mail_table (PropertyData *pd) CORBA_exception_free (&ev); widget = bonobo_widget_new_control_from_objref (control, CORBA_OBJECT_NIL); - gtk_object_set_data (GTK_OBJECT (widget), "listener", listener); - gtk_object_set_data (GTK_OBJECT (widget), "corba_view", view); + g_object_set_data (G_OBJECT (widget), "listener", listener); + g_object_set_data (G_OBJECT (widget), "corba_view", view); set_selected_folders (view); return widget; @@ -1332,7 +1330,7 @@ get_folders_from_view (GtkWidget *view) GList *out_list = NULL; int i; - set_view = gtk_object_get_data (GTK_OBJECT (view), "corba_view"); + set_view = g_object_get_data (G_OBJECT (view), "corba_view"); CORBA_exception_init (&ev); list = GNOME_Evolution_StorageSetView__get_checkedFolders (set_view, &ev); -- cgit v1.2.3