GNOME.org
 

[gnome-commander] Replacing obsoleted gtk_object_get_data() with g_object_get_data()

commit cdc0e72763118f75df6c9480d375b8032e83f5c8
Author: Piotr Eljasiak <epiotr src gnome org>
Date:   Sun Nov 6 11:43:39 2011 +0100

    Replacing obsoleted gtk_object_get_data() with g_object_get_data()

 libgcmd/libgcmd-widget-factory.cc        |    4 ++--
 plugins/cvs/cvs-plugin.cc                |    4 ++--
 plugins/cvs/interface.cc                 |    4 ++--
 plugins/fileroller/file-roller-plugin.cc |    4 ++--
 src/gnome-cmd-dir-indicator.cc           |    4 ++--
 src/gnome-cmd-file-selector.cc           |    2 +-
 src/gnome-cmd-options-dialog.cc          |   14 +++++++-------
 src/gnome-cmd-prepare-copy-dialog.cc     |    6 +++---
 src/gnome-cmd-prepare-move-dialog.cc     |    6 +++---
 9 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/libgcmd/libgcmd-widget-factory.cc b/libgcmd/libgcmd-widget-factory.cc
index 459517c..ddfae6a 100644
--- a/libgcmd/libgcmd-widget-factory.cc
+++ b/libgcmd/libgcmd-widget-factory.cc
@@ -37,7 +37,7 @@ GtkWidget *lookup_widget (GtkWidget *widget, const gchar *widget_name)
         widget = parent;
     }
 
-    found_widget = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (widget), widget_name);
+    found_widget = (GtkWidget *) g_object_get_data (G_OBJECT (widget), widget_name);
     if (!found_widget)
         g_warning ("Widget not found: %s", widget_name);
     return found_widget;
@@ -393,7 +393,7 @@ GtkWidget *create_clist (GtkWidget *parent, const gchar *name, gint cols, gint r
 
 void create_clist_column (GtkWidget *sw, gint col, gint width, const gchar *label)
 {
-    GtkWidget *clist = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (sw), "clist");
+    GtkWidget *clist = (GtkWidget *) g_object_get_data (G_OBJECT (sw), "clist");
     gtk_clist_set_column_width (GTK_CLIST (clist), col, width);
     gtk_clist_set_column_title (GTK_CLIST (clist), col, label);
 }
diff --git a/plugins/cvs/cvs-plugin.cc b/plugins/cvs/cvs-plugin.cc
index 998bc99..975f92b 100644
--- a/plugins/cvs/cvs-plugin.cc
+++ b/plugins/cvs/cvs-plugin.cc
@@ -103,7 +103,7 @@ static gboolean change_cwd (const gchar *fpath)
 static void on_diff (GtkMenuItem *item, GnomeCmdState *state)
 {
     GList *files = state->active_dir_selected_files;
-    CvsPlugin *plugin = (CvsPlugin *) gtk_object_get_data (GTK_OBJECT (item), "plugin");
+    CvsPlugin *plugin = (CvsPlugin *) g_object_get_data (G_OBJECT (item), "plugin");
 
     if (files && !plugin->diff_win)
         plugin->diff_win = create_diff_win (plugin);
@@ -129,7 +129,7 @@ static void on_diff (GtkMenuItem *item, GnomeCmdState *state)
 static void on_log (GtkMenuItem *item, GnomeCmdState *state)
 {
     GList *files = state->active_dir_selected_files;
-    CvsPlugin *plugin = (CvsPlugin *) gtk_object_get_data (GTK_OBJECT (item), "plugin");
+    CvsPlugin *plugin = (CvsPlugin *) g_object_get_data (G_OBJECT (item), "plugin");
 
     if (files && !plugin->log_win)
         plugin->log_win = create_log_win (plugin);
diff --git a/plugins/cvs/interface.cc b/plugins/cvs/interface.cc
index 11b142f..65ab7f9 100644
--- a/plugins/cvs/interface.cc
+++ b/plugins/cvs/interface.cc
@@ -79,9 +79,9 @@ static void on_compare_ok (GtkButton *button, GtkWidget *dialog)
     GtkWidget *prev_rev_radio = lookup_widget (GTK_WIDGET (button), "prev_rev_radio");
     LogHistory *log_history = (LogHistory *) lookup_widget (GTK_WIDGET (button), "log_history");
 
-    const gchar *selected_rev = (const gchar *) gtk_object_get_data (GTK_OBJECT (dialog), "selected_rev");
+    const gchar *selected_rev = (const gchar *) g_object_get_data (G_OBJECT (dialog), "selected_rev");
     const gchar *selected_other_rev = get_combo_text (combo);
-    const gchar *prev_rev = (const gchar *) gtk_object_get_data (GTK_OBJECT (dialog), "prev_rev");
+    const gchar *prev_rev = (const gchar *) g_object_get_data (G_OBJECT (dialog), "prev_rev");
 
     if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (head_radio)))
         args = g_strdup_printf ("-r %s", selected_rev);
diff --git a/plugins/fileroller/file-roller-plugin.cc b/plugins/fileroller/file-roller-plugin.cc
index 4b10ea4..28c3d05 100644
--- a/plugins/fileroller/file-roller-plugin.cc
+++ b/plugins/fileroller/file-roller-plugin.cc
@@ -92,8 +92,8 @@ static void on_extract_cwd (GtkMenuItem *item, GnomeVFSURI *uri)
     gchar *target_arg, *archive_arg;
     gchar *uri_str = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
     gchar *local_path = gnome_vfs_get_local_path_from_uri (uri_str);
-    gchar *target_name = (gchar *) gtk_object_get_data (GTK_OBJECT (item), "target_name");
-    gchar *target_dir = (gchar *) gtk_object_get_data (GTK_OBJECT (item), "target_dir");
+    gchar *target_name = (gchar *) g_object_get_data (G_OBJECT (item), "target_name");
+    gchar *target_dir = (gchar *) g_object_get_data (G_OBJECT (item), "target_dir");
     gchar *cmd, *t;
     gint argc;
     gchar **argv;
diff --git a/src/gnome-cmd-dir-indicator.cc b/src/gnome-cmd-dir-indicator.cc
index af44af7..1e56dd2 100644
--- a/src/gnome-cmd-dir-indicator.cc
+++ b/src/gnome-cmd-dir-indicator.cc
@@ -281,7 +281,7 @@ static void on_dir_history_item_selected (GtkMenuItem *item, const gchar *path)
     GdkModifierType mask;
     gdk_window_get_pointer (NULL, NULL, NULL, &mask);
 
-    GnomeCmdDirIndicator *indicator = (GnomeCmdDirIndicator *) gtk_object_get_data (GTK_OBJECT (item), "indicator");
+    GnomeCmdDirIndicator *indicator = (GnomeCmdDirIndicator *) g_object_get_data (G_OBJECT (item), "indicator");
 
     g_return_if_fail (GNOME_CMD_IS_DIR_INDICATOR (indicator));
 
@@ -305,7 +305,7 @@ static void on_bookmark_item_selected (GtkMenuItem *item, GnomeCmdBookmark *bm)
     GdkModifierType mask;
     gdk_window_get_pointer (NULL, NULL, NULL, &mask);
 
-    GnomeCmdDirIndicator *indicator = (GnomeCmdDirIndicator *) gtk_object_get_data (GTK_OBJECT (item), "indicator");
+    GnomeCmdDirIndicator *indicator = (GnomeCmdDirIndicator *) g_object_get_data (G_OBJECT (item), "indicator");
 
     g_return_if_fail (GNOME_CMD_IS_DIR_INDICATOR (indicator));
 
diff --git a/src/gnome-cmd-file-selector.cc b/src/gnome-cmd-file-selector.cc
index 9f743ac..c055dc5 100644
--- a/src/gnome-cmd-file-selector.cc
+++ b/src/gnome-cmd-file-selector.cc
@@ -342,7 +342,7 @@ static void on_con_btn_clicked (GtkWidget *widget, GdkEventButton *event, GnomeC
     if (event->button!=1 && event->button!=2)
         return;
 
-    GnomeCmdCon *con = (GnomeCmdCon *) gtk_object_get_data (GTK_OBJECT (widget), "con");
+    GnomeCmdCon *con = (GnomeCmdCon *) g_object_get_data (G_OBJECT (widget), "con");
 
     g_return_if_fail (GNOME_CMD_IS_CON (con));
 
diff --git a/src/gnome-cmd-options-dialog.cc b/src/gnome-cmd-options-dialog.cc
index bb3a8e3..ffddc0d 100644
--- a/src/gnome-cmd-options-dialog.cc
+++ b/src/gnome-cmd-options-dialog.cc
@@ -1293,7 +1293,7 @@ static void on_edit_app_dialog_ok (GtkButton *button, GtkWidget *dialog)
                            &handles_uris, &handles_multiple, &requires_terminal);
     if (!name || strlen (name) < 1) return;
 
-    GnomeCmdApp *app = (GnomeCmdApp *) gtk_object_get_data (GTK_OBJECT (options_dialog), "selected_app");
+    GnomeCmdApp *app = (GnomeCmdApp *) g_object_get_data (G_OBJECT (options_dialog), "selected_app");
     if (!app) return;
 
     gnome_cmd_app_set_name (app, name);
@@ -1430,7 +1430,7 @@ static void on_app_add (GtkWidget *button, GtkWidget *parent)
 
 static void on_app_edit (GtkWidget *button, GtkWidget *parent)
 {
-    GnomeCmdApp *app = (GnomeCmdApp *) gtk_object_get_data (GTK_OBJECT (parent), "selected_app");
+    GnomeCmdApp *app = (GnomeCmdApp *) g_object_get_data (G_OBJECT (parent), "selected_app");
     if (app)
     {
         GtkWidget *dialog = create_app_dialog (app, GTK_SIGNAL_FUNC (on_edit_app_dialog_ok), GTK_SIGNAL_FUNC (on_app_dialog_cancel), parent);
@@ -1584,7 +1584,7 @@ static GtkWidget *create_programs_tab (GtkWidget *parent)
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_container_add (GTK_CONTAINER (bbox), button);
 
-    clist = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (parent), "app_clist");
+    clist = (GtkWidget *) g_object_get_data (G_OBJECT (parent), "app_clist");
     for (GList *apps = gnome_cmd_data_get_fav_apps (); apps; apps = apps->next)
         add_app_to_list (GTK_CLIST (clist), (GnomeCmdApp *) apps->data);
 
@@ -1705,7 +1705,7 @@ static void on_edit_device_dialog_ok (GtkButton *button, GtkWidget *dialog)
     get_device_dialog_values (dialog, &alias, &device, &mountp, &icon_path);
     if (!alias || strlen (alias) < 1) return;
 
-    GnomeCmdConDevice *dev = GNOME_CMD_CON_DEVICE (gtk_object_get_data (GTK_OBJECT (options_dialog), "selected_device"));
+    GnomeCmdConDevice *dev = GNOME_CMD_CON_DEVICE (g_object_get_data (G_OBJECT (options_dialog), "selected_device"));
     if (!dev) return;
 
     update_device_in_list (GTK_CLIST (clist), dev, alias, device, mountp, icon_path);
@@ -1786,8 +1786,8 @@ static void on_device_add (GtkWidget *button, GtkWidget *parent)
 
 static void on_device_edit (GtkWidget *button, GtkWidget *parent)
 {
-    GnomeCmdConDevice *dev = GNOME_CMD_CON_DEVICE (gtk_object_get_data (
-        GTK_OBJECT (parent), "selected_device"));
+    GnomeCmdConDevice *dev = GNOME_CMD_CON_DEVICE (g_object_get_data (G_OBJECT (parent), "selected_device"));
+
     if (dev)
     {
         GtkWidget *dialog = create_device_dialog (
@@ -1919,7 +1919,7 @@ static GtkWidget *create_devices_tab (GtkWidget *parent)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), gnome_cmd_data.skip_mounting);
 
 
-    clist = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (parent), "device_clist");
+    clist = (GtkWidget *) g_object_get_data (G_OBJECT (parent), "device_clist");
     for (GList *devices = gnome_cmd_con_list_get_all_dev (gnome_cmd_con_list_get ()); devices; devices = devices->next)
         if (!gnome_cmd_con_device_get_autovol ((GnomeCmdConDevice *) devices->data))
             add_device_to_list (GTK_CLIST (clist), GNOME_CMD_CON_DEVICE (devices->data));
diff --git a/src/gnome-cmd-prepare-copy-dialog.cc b/src/gnome-cmd-prepare-copy-dialog.cc
index a5dbc9d..bed33fc 100644
--- a/src/gnome-cmd-prepare-copy-dialog.cc
+++ b/src/gnome-cmd-prepare-copy-dialog.cc
@@ -121,12 +121,12 @@ void gnome_cmd_prepare_copy_dialog_show (GnomeCmdFileSelector *from, GnomeCmdFil
     // Customize prepare xfer widgets
 
     text = get_bold_text (_("Overwrite Files"));
-    label = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (data->dialog->left_vbox_frame), "label");
+    label = (GtkWidget *) g_object_get_data (G_OBJECT (data->dialog->left_vbox_frame), "label");
     gtk_label_set_markup (GTK_LABEL (label), text);
     g_free (text);
 
     text = get_bold_text (_("Options"));
-    label = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (data->dialog->right_vbox_frame), "label");
+    label = (GtkWidget *) g_object_get_data (G_OBJECT (data->dialog->right_vbox_frame), "label");
     gtk_label_set_markup (GTK_LABEL (label), text);
     g_free (text);
 
@@ -143,7 +143,7 @@ void gnome_cmd_prepare_copy_dialog_show (GnomeCmdFileSelector *from, GnomeCmdFil
         dest_dir_frame_msg = g_strdup_printf (ngettext("copy %d file to","copy %d files to",num_files), num_files);
 
     text = get_bold_text (dest_dir_frame_msg);
-    label = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (data->dialog->dest_dir_frame), "label");
+    label = (GtkWidget *) g_object_get_data (G_OBJECT (data->dialog->dest_dir_frame), "label");
     gtk_label_set_markup (GTK_LABEL (label), text);
     g_free (text);
 
diff --git a/src/gnome-cmd-prepare-move-dialog.cc b/src/gnome-cmd-prepare-move-dialog.cc
index 65aa488..42ca018 100644
--- a/src/gnome-cmd-prepare-move-dialog.cc
+++ b/src/gnome-cmd-prepare-move-dialog.cc
@@ -107,12 +107,12 @@ void gnome_cmd_prepare_move_dialog_show (GnomeCmdFileSelector *from, GnomeCmdFil
     // Customize prepare xfer widgets
 
     text = get_bold_text (_("Overwrite Files"));
-    label = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (data->dialog->left_vbox_frame), "label");
+    label = (GtkWidget *) g_object_get_data (G_OBJECT (data->dialog->left_vbox_frame), "label");
     gtk_label_set_markup (GTK_LABEL (label), text);
     g_free (text);
 
     text = get_bold_text (_("Options"));
-    label = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (data->dialog->right_vbox_frame), "label");
+    label = (GtkWidget *) g_object_get_data (G_OBJECT (data->dialog->right_vbox_frame), "label");
     gtk_label_set_markup (GTK_LABEL (label), text);
     g_free (text);
 
@@ -129,7 +129,7 @@ void gnome_cmd_prepare_move_dialog_show (GnomeCmdFileSelector *from, GnomeCmdFil
         dest_dir_frame_msg = g_strdup_printf (ngettext("move %d file to","move %d files to",num_files), num_files);
 
     text = get_bold_text (dest_dir_frame_msg);
-    label = (GtkWidget *) gtk_object_get_data (GTK_OBJECT (data->dialog->dest_dir_frame), "label");
+    label = (GtkWidget *) g_object_get_data (G_OBJECT (data->dialog->dest_dir_frame), "label");
     gtk_label_set_markup (GTK_LABEL (label), text);
     g_free (text);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]