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

1 files changed, 3 insertions, 3 deletions

diff --git a/shell/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c
index fd973d663d..d3961bb8c4 100644
--- a/shell/e-shell-user-creatable-items-handler.c
+++ b/shell/e-shell-user-creatable-items-handler.c
@@ -517,7 +517,7 @@ add_verbs (EShellUserCreatableItemsHandler *handler,
 	priv = handler->priv;
 
 	ui_component = e_shell_view_get_bonobo_ui_component (shell_view);
-	gtk_object_set_data (GTK_OBJECT (ui_component), SHELL_VIEW_KEY, shell_view);
+	g_object_set_data (G_OBJECT (ui_component), SHELL_VIEW_KEY, shell_view);
 
 	component_num = 0;
 	for (p = priv->components; p != NULL; p = p->next) {
@@ -593,10 +593,10 @@ setup_toolbar_button (EShellUserCreatableItemsHandler *handler,
 	bonobo_ui_component_object_set (ui_component, "/Toolbar/NewComboButton",
 					BONOBO_OBJREF (control), NULL);
 
-	gtk_object_set_data (GTK_OBJECT (shell_view), COMBO_BUTTON_WIDGET_KEY, combo_button);
+	g_object_set_data (G_OBJECT (shell_view), COMBO_BUTTON_WIDGET_KEY, combo_button);
 
 	tooltips = gtk_tooltips_new ();
-	gtk_object_set_data (GTK_OBJECT (combo_button), TOOLTIPS_KEY, tooltips);
+	g_object_set_data (G_OBJECT (combo_button), TOOLTIPS_KEY, tooltips);
 }