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-storage-set-view.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'shell/e-storage-set-view.c') diff --git a/shell/e-storage-set-view.c b/shell/e-storage-set-view.c index 2b093e19fd..1990adda21 100644 --- a/shell/e-storage-set-view.c +++ b/shell/e-storage-set-view.c @@ -410,7 +410,8 @@ convert_gdk_drag_action_set_to_corba (GdkDragAction action) /* The weakref callback for priv->ui_component. */ static void -ui_container_destroy_notify (void *data) +ui_container_destroy_notify (void *data, + GObject *where_the_object_was) { EStorageSetViewPrivate *priv = (EStorageSetViewPrivate *) data; @@ -1434,9 +1435,7 @@ etree_value_at (ETreeModel *etree, name_with_unread = g_strdup_printf ("%s (%d)", folder_name, unread_count); - gtk_object_set_data_full (GTK_OBJECT (folder), - "name_with_unread", - name_with_unread, g_free); + g_object_set_data_full (G_OBJECT (folder), "name_with_unread", name_with_unread, g_free); return (void *) name_with_unread; } else @@ -2087,7 +2086,7 @@ e_storage_set_view_construct (EStorageSetView *storage_set_view, priv->ui_container = ui_container; if (ui_container != NULL) { - gtk_object_weakref (GTK_OBJECT (ui_container), ui_container_destroy_notify, priv); + g_object_weak_ref (G_OBJECT (ui_container), ui_container_destroy_notify, priv); priv->ui_component = bonobo_ui_component_new_default (); bonobo_ui_component_set_container (priv->ui_component, -- cgit v1.2.3