aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog13
-rw-r--r--shell/e-folder-list.c2
-rw-r--r--shell/e-shell-config-default-folders.c4
-rw-r--r--shell/e-shell-folder-creation-dialog.c2
-rw-r--r--shell/e-shell-importer.c2
-rw-r--r--shell/e-shell-shared-folder-picker-dialog.c3
-rw-r--r--shell/e-shell-user-creatable-items-handler.c6
-rw-r--r--shell/e-shell-view.c9
-rw-r--r--shell/e-shell.c4
-rw-r--r--shell/e-storage.c2
10 files changed, 29 insertions, 18 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 09c9b4b283..88d4b178fe 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,18 @@
2002-11-05 Ettore Perazzoli <ettore@ximian.com>
+ * e-folder-list.c: Use g_object_get_data() instead of
+ gtk_object_get_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.c: Likewise.
+
+2002-11-05 Ettore Perazzoli <ettore@ximian.com>
+
* e-activity-handler.c: Split finalize/dispose.
* e-corba-shortcuts.c: Likewise.
* e-corba-storage-registry.c: Likewise.
diff --git a/shell/e-folder-list.c b/shell/e-folder-list.c
index 518e193b78..a3158e3bb7 100644
--- a/shell/e-folder-list.c
+++ b/shell/e-folder-list.c
@@ -426,7 +426,7 @@ e_folder_list_init (EFolderList *efl)
efl->priv->option_menu = E_OPTION_MENU(glade_xml_get_widget (gui, "custom-optionmenu"));
e_folder_list_set_option_menu_strings (efl, NULL);
efl->priv->scrolled_table = E_TABLE_SCROLLED(glade_xml_get_widget(gui, "custom-folder-list"));
- efl->priv->model = E_TABLE_MEMORY_STORE (gtk_object_get_data (GTK_OBJECT (efl->priv->scrolled_table), "table-model"));
+ efl->priv->model = E_TABLE_MEMORY_STORE (g_object_get_data (G_OBJECT (efl->priv->scrolled_table), "table-model"));
e_glade_xml_connect_widget (gui, "button-add", "clicked",
GTK_SIGNAL_FUNC (add_clicked), efl);
diff --git a/shell/e-shell-config-default-folders.c b/shell/e-shell-config-default-folders.c
index 0721de8e47..776bb015de 100644
--- a/shell/e-shell-config-default-folders.c
+++ b/shell/e-shell-config-default-folders.c
@@ -58,8 +58,8 @@ folder_selected (EvolutionFolderSelectorButton *button,
{
char **uri_ptr, **path_ptr;
- uri_ptr = gtk_object_get_data (GTK_OBJECT (button), "uri_ptr");
- path_ptr = gtk_object_get_data (GTK_OBJECT (button), "path_ptr");
+ uri_ptr = g_object_get_data (G_OBJECT (button), "uri_ptr");
+ path_ptr = g_object_get_data (G_OBJECT (button), "path_ptr");
g_free (*uri_ptr);
g_free (*path_ptr);
diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
index 907a21abc4..1b72c1167a 100644
--- a/shell/e-shell-folder-creation-dialog.c
+++ b/shell/e-shell-folder-creation-dialog.c
@@ -187,7 +187,7 @@ dialog_clicked_cb (GnomeDialog *dialog,
storage_set = e_shell_get_storage_set (dialog_data->shell);
folder_type_menu_item = GTK_OPTION_MENU (dialog_data->folder_type_option_menu)->menu_item;
- folder_type = gtk_object_get_data (GTK_OBJECT (folder_type_menu_item), "folder_type");
+ folder_type = g_object_get_data (G_OBJECT (folder_type_menu_item), "folder_type");
if (folder_type == NULL) {
g_warning ("Cannot get folder type for selected GtkOptionMenu item.");
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index f46a392d33..9cfedb9dc0 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -600,7 +600,7 @@ item_selected (GtkWidget *item,
char *iid;
g_free (data->choosen_iid);
- iid = gtk_object_get_data (GTK_OBJECT (item), "oafiid");
+ iid = g_object_get_data (G_OBJECT (item), "oafiid");
if (iid == NULL)
data->choosen_iid = g_strdup ("Automatic");
else
diff --git a/shell/e-shell-shared-folder-picker-dialog.c b/shell/e-shell-shared-folder-picker-dialog.c
index 816a3d7e87..16fee71c10 100644
--- a/shell/e-shell-shared-folder-picker-dialog.c
+++ b/shell/e-shell-shared-folder-picker-dialog.c
@@ -158,8 +158,7 @@ server_option_menu_item_activate_callback (GtkMenuItem *menu_item,
if (*storage_name_return != NULL)
g_free (*storage_name_return);
- *storage_name_return = g_strdup ((const char *) gtk_object_get_data (GTK_OBJECT (menu_item),
- "storage_name"));
+ *storage_name_return = g_strdup ((const char *) g_object_get_data (G_OBJECT (menu_item), "storage_name"));
}
static void
diff --git a/shell/e-shell-user-creatable-items-handler.c b/shell/e-shell-user-creatable-items-handler.c
index 5537de5589..e68738007f 100644
--- a/shell/e-shell-user-creatable-items-handler.c
+++ b/shell/e-shell-user-creatable-items-handler.c
@@ -497,7 +497,7 @@ verb_fn (BonoboUIComponent *ui_component,
EShellUserCreatableItemsHandler *handler;
EShellView *shell_view;
- shell_view = gtk_object_get_data (GTK_OBJECT (ui_component), SHELL_VIEW_KEY);
+ shell_view = g_object_get_data (G_OBJECT (ui_component), SHELL_VIEW_KEY);
g_assert (E_IS_SHELL_VIEW (shell_view));
handler = E_SHELL_USER_CREATABLE_ITEMS_HANDLER (data);
@@ -623,10 +623,10 @@ shell_view_view_changed_callback (EShellView *shell_view,
handler = E_SHELL_USER_CREATABLE_ITEMS_HANDLER (data);
priv = handler->priv;
- combo_button_widget = gtk_object_get_data (GTK_OBJECT (shell_view), COMBO_BUTTON_WIDGET_KEY);
+ combo_button_widget = g_object_get_data (G_OBJECT (shell_view), COMBO_BUTTON_WIDGET_KEY);
g_assert (E_IS_COMBO_BUTTON (combo_button_widget));
- tooltips = gtk_object_get_data (GTK_OBJECT (combo_button_widget), TOOLTIPS_KEY);
+ tooltips = g_object_get_data (G_OBJECT (combo_button_widget), TOOLTIPS_KEY);
g_assert (tooltips != NULL);
default_menu_item = get_default_action_for_view (handler, shell_view);
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 92d728cf08..bc5be0b5a9 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -549,8 +549,7 @@ storage_set_removed_folder_callback (EStorageSet *storage_set,
socket = find_socket (GTK_CONTAINER (view->control));
priv->sockets = g_list_remove (priv->sockets, socket);
- destroy_connection_id = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (socket),
- "e_shell_view_destroy_connection_id"));
+ destroy_connection_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (socket), "e_shell_view_destroy_connection_id"));
gtk_signal_disconnect (GTK_OBJECT (socket), destroy_connection_id);
page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook), view->control);
@@ -1370,8 +1369,8 @@ destroy (GtkObject *object)
int destroy_connection_id;
socket_widget = GTK_WIDGET (p->data);
- destroy_connection_id = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (socket_widget),
- "e_shell_view_destroy_connection_id"));
+ destroy_connection_id = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (socket_widget),
+ "e_shell_view_destroy_connection_id"));
gtk_signal_disconnect (GTK_OBJECT (socket_widget), destroy_connection_id);
}
@@ -2053,7 +2052,7 @@ socket_destroy_cb (GtkWidget *socket_widget, gpointer data)
shell_view = E_SHELL_VIEW (data);
priv = shell_view->priv;
- uri = (const char *) gtk_object_get_data (GTK_OBJECT (socket_widget), "e_shell_view_folder_uri");
+ uri = (const char *) g_object_get_data (G_OBJECT (socket_widget), "e_shell_view_folder_uri");
view = g_hash_table_lookup (priv->uri_to_view, uri);
if (view == NULL) {
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 4b18b739d3..ef9eee8b6e 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -230,7 +230,7 @@ folder_selection_dialog_cancelled_cb (EShellFolderSelectionDialog *folder_select
GNOME_Evolution_FolderSelectionListener listener;
CORBA_Environment ev;
- listener = gtk_object_get_data (GTK_OBJECT (folder_selection_dialog), "corba_listener");
+ listener = g_object_get_data (G_OBJECT (folder_selection_dialog), "corba_listener");
CORBA_exception_init (&ev);
@@ -254,7 +254,7 @@ folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_
GNOME_Evolution_Folder corba_folder;
shell = E_SHELL (data);
- listener = gtk_object_get_data (GTK_OBJECT (folder_selection_dialog), "corba_listener");
+ listener = g_object_get_data (G_OBJECT (folder_selection_dialog), "corba_listener");
CORBA_exception_init (&ev);
diff --git a/shell/e-storage.c b/shell/e-storage.c
index 62ae4b9e77..d8390346e7 100644
--- a/shell/e-storage.c
+++ b/shell/e-storage.c
@@ -112,7 +112,7 @@ folder_changed_cb (EFolder *folder,
g_signal_emit (storage, signals[UPDATED_FOLDER], 0, path);
- highlight = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (folder), "last_highlight"));
+ highlight = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (folder), "last_highlight"));
if (highlight != e_folder_get_highlighted (folder)) {
highlight = !highlight;
g_object_set_data (G_OBJECT (folder), "last_highlight", GINT_TO_POINTER (highlight));