From 317b30ce9e92f0e9c18e4905cd6b8ae1e28b3602 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Mon, 4 Nov 2002 07:12:04 +0000 Subject: Use g_object_set_data() instead of gtk_object_set_data(). Likewise. * e-folder-list.c: Use g_object_set_data() instead of gtk_object_set_data(). * e-shell-config-default-folders.c: Likewise. * e-shell-folder-creation-dialog.c: Likewise. * e-shell-importer.c: Likewise. * e-shell-shared-folder-picker-dialog.c: Likewise. * e-shell-user-creatable-items-handler.c: Likewise. * e-shell-view.c: Likewise. * e-shell.c: Likewise. * e-storage-set-view.c: Likewise. * e-storage.c: Likewise. * evolution-test-component.c: Likewise. * e-storage-set-view.c (e_storage_set_view_construct): Use g_object_weakref() instead of gtk_object_weakref() for the ui_container. (ui_container_destroy_notify): Add param where_the_object_was to match the GWeakNotify prototype. * e-shell.c: Use g_signal_emit() instead of gtk_signal_emit(). svn path=/trunk/; revision=18523 --- shell/e-shell-importer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'shell/e-shell-importer.c') diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c index 31721660b0..f46a392d33 100644 --- a/shell/e-shell-importer.c +++ b/shell/e-shell-importer.c @@ -618,8 +618,7 @@ create_plugin_menu (ImportData *data) menu = gtk_menu_new (); item = gtk_menu_item_new_with_label (_("Automatic")); - gtk_object_set_data_full (GTK_OBJECT (item), "oafiid", - g_strdup ("Automatic"), g_free); + g_object_set_data_full (item, "oafiid", g_strdup ("Automatic"), g_free); gtk_menu_append (GTK_MENU (menu), item); CORBA_exception_init (&ev); @@ -641,8 +640,7 @@ create_plugin_menu (ImportData *data) g_signal_connect (item, "activate", G_CALLBACK (item_selected), data); - gtk_object_set_data_full (GTK_OBJECT (item), "oafiid", - g_strdup (info->iid), g_free); + g_object_set_data (item, "oafiid", g_strdup (info->iid), g_free); gtk_menu_append (GTK_MENU (menu), item); } CORBA_free (info_list); -- cgit v1.2.3