gnome-commander r2468 - in trunk: . doc/C libgcmd plugins/cvs plugins/fileroller src

[epiotr svn gnome org]

Author: epiotr
Date: Fri Feb 13 17:47:10 2009
New Revision: 2468
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2468&view=rev

Log:
Fixed problem #571558 (replacing deprecated GNOME_STOCK_* buttons with GTK_STOCK_* counterparts)

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/doc/C/gnome-commander.xml
   trunk/libgcmd/gnome-cmd-string-dialog.c
   trunk/plugins/cvs/cvs-plugin.c
   trunk/plugins/cvs/interface.c
   trunk/plugins/fileroller/file-roller-plugin.c
   trunk/src/gnome-cmd-bookmark-dialog.cc
   trunk/src/gnome-cmd-chmod-dialog.cc
   trunk/src/gnome-cmd-chown-dialog.cc
   trunk/src/gnome-cmd-delete-dialog.cc
   trunk/src/gnome-cmd-dir.cc
   trunk/src/gnome-cmd-file-selector.cc
   trunk/src/gnome-cmd-options-dialog.cc
   trunk/src/gnome-cmd-patternsel-dialog.cc
   trunk/src/gnome-cmd-prepare-xfer-dialog.cc
   trunk/src/gnome-cmd-xfer-progress-win.cc
   trunk/src/plugin_manager.cc

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Fri Feb 13 17:47:10 2009
@@ -14,6 +14,7 @@
  * Fixed problem #570727 (usage of deprecated gnome_url_show)
  * Fixed problem #571239 (replacing obsoleted GnomeColorPicker with GtkColorButton)
  * Fixed problem #571247 (replacing obsoleted GnomePixmap with GtkImage)
+ * Fixed problem #571558 (replacing deprecated GNOME_STOCK_* buttons with GTK_STOCK_* counterparts)
  * Fixed problem with setting equal pane size in horizontal mode
 
 New features:

Modified: trunk/doc/C/gnome-commander.xml
==============================================================================
--- trunk/doc/C/gnome-commander.xml	(original)
+++ trunk/doc/C/gnome-commander.xml	Fri Feb 13 17:47:10 2009
@@ -5936,6 +5936,9 @@
                             <para>Fixed problem #571247 (replacing obsoleted GnomePixmap with GtkImage)</para>
                         </listitem>
                         <listitem>
+                            <para>Fixed problem #571558 (replacing deprecated GNOME_STOCK_* buttons with GTK_STOCK_* counterparts)</para>
+                        </listitem>
+                        <listitem>
                             <para>Fixed problem with setting equal pane size in horizontal mode</para>
                         </listitem>
                     </itemizedlist>

Modified: trunk/libgcmd/gnome-cmd-string-dialog.c
==============================================================================
--- trunk/libgcmd/gnome-cmd-string-dialog.c	(original)
+++ trunk/libgcmd/gnome-cmd-string-dialog.c	Fri Feb 13 17:47:10 2009
@@ -144,10 +144,10 @@
 
     gnome_cmd_dialog_add_button (
         GNOME_CMD_DIALOG (dialog),
-        GNOME_STOCK_BUTTON_CANCEL, GTK_SIGNAL_FUNC (on_cancel), string_dialog);
+        GTK_STOCK_CANCEL, GTK_SIGNAL_FUNC (on_cancel), string_dialog);
     btn = gnome_cmd_dialog_add_button (
         GNOME_CMD_DIALOG (dialog),
-        GNOME_STOCK_BUTTON_OK, GTK_SIGNAL_FUNC (on_ok), string_dialog);
+        GTK_STOCK_OK, GTK_SIGNAL_FUNC (on_ok), string_dialog);
 
     gtk_widget_grab_focus (string_dialog->entries[0]);
     gtk_widget_grab_default (btn);

Modified: trunk/plugins/cvs/cvs-plugin.c
==============================================================================
--- trunk/plugins/cvs/cvs-plugin.c	(original)
+++ trunk/plugins/cvs/cvs-plugin.c	Fri Feb 13 17:47:10 2009
@@ -297,7 +297,7 @@
     gnome_cmd_dialog_set_transient_for (GNOME_CMD_DIALOG (dialog), GTK_WINDOW (main_win_widget));
     gnome_cmd_dialog_set_modal (GNOME_CMD_DIALOG (dialog));
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_OK,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_OK,
                                  GTK_SIGNAL_FUNC (on_configure_close), plugin);
 
     vbox = create_vbox (dialog, FALSE, 12);

Modified: trunk/plugins/cvs/interface.c
==============================================================================
--- trunk/plugins/cvs/interface.c	(original)
+++ trunk/plugins/cvs/interface.c	Fri Feb 13 17:47:10 2009
@@ -188,9 +188,9 @@
     gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, FALSE, 0);
     gtk_widget_set_sensitive (combo, FALSE);
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CANCEL,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_CANCEL,
                                  GTK_SIGNAL_FUNC (on_compare_cancel), dialog);
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_OK,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_OK,
                                  GTK_SIGNAL_FUNC (on_compare_ok), dialog);
 
     return dialog;
@@ -258,7 +258,7 @@
     gtk_window_set_default_size (GTK_WINDOW (dialog), 510, 300);
 
     gnome_cmd_dialog_add_button (
-        GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CLOSE,
+        GNOME_CMD_DIALOG (dialog), GTK_STOCK_CLOSE,
         GTK_SIGNAL_FUNC (on_diff_window_close), plugin);
 
     gtk_signal_connect (GTK_OBJECT (dialog), "delete-event", GTK_SIGNAL_FUNC (on_diff_win_delete), plugin);
@@ -288,7 +288,7 @@
     gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);
 
     gnome_cmd_dialog_add_button (
-        GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CLOSE,
+        GNOME_CMD_DIALOG (dialog), GTK_STOCK_CLOSE,
         GTK_SIGNAL_FUNC (on_log_window_close), plugin);
 
     gtk_signal_connect (GTK_OBJECT (dialog), "delete-event",

Modified: trunk/plugins/fileroller/file-roller-plugin.c
==============================================================================
--- trunk/plugins/fileroller/file-roller-plugin.c	(original)
+++ trunk/plugins/fileroller/file-roller-plugin.c	Fri Feb 13 17:47:10 2009
@@ -362,7 +362,7 @@
         GTK_WINDOW (main_win_widget));
     gnome_cmd_dialog_set_modal (GNOME_CMD_DIALOG (dialog));
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_OK,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_OK,
                                  GTK_SIGNAL_FUNC (on_configure_close), plugin);
 
     vbox = create_vbox (dialog, FALSE, 12);

Modified: trunk/src/gnome-cmd-bookmark-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-bookmark-dialog.cc	(original)
+++ trunk/src/gnome-cmd-bookmark-dialog.cc	Fri Feb 13 17:47:10 2009
@@ -480,21 +480,21 @@
     gtk_widget_set_sensitive (GTK_WIDGET (in_dialog->priv->remove_btn), FALSE);
 
     in_dialog->priv->move_up_btn = create_named_stock_button (
-        dialog, GNOME_STOCK_BUTTON_UP, "move_up_button",
+        dialog, GTK_STOCK_GO_UP, "move_up_button",
         GTK_SIGNAL_FUNC (on_dir_move_up));
     GTK_WIDGET_SET_FLAGS (in_dialog->priv->move_up_btn, GTK_CAN_DEFAULT);
     gtk_box_pack_start (GTK_BOX (bbox), in_dialog->priv->move_up_btn, FALSE, TRUE, 0);
     gtk_widget_set_sensitive (GTK_WIDGET (in_dialog->priv->move_up_btn), FALSE);
 
     in_dialog->priv->move_down_btn = create_named_stock_button (
-        dialog, GNOME_STOCK_BUTTON_DOWN, "move_down_button",
+        dialog, GTK_STOCK_GO_DOWN, "move_down_button",
         GTK_SIGNAL_FUNC (on_dir_move_down));
     GTK_WIDGET_SET_FLAGS (in_dialog->priv->move_down_btn, GTK_CAN_DEFAULT);
     gtk_box_pack_start (GTK_BOX (bbox), in_dialog->priv->move_down_btn, FALSE, TRUE, 0);
     gtk_widget_set_sensitive (GTK_WIDGET (in_dialog->priv->move_down_btn), FALSE);
 
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CLOSE,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_CLOSE,
                                  GTK_SIGNAL_FUNC (on_close), dialog);
 
     gtk_signal_connect (GTK_OBJECT (dialog), "key-press-event",

Modified: trunk/src/gnome-cmd-chmod-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-chmod-dialog.cc	(original)
+++ trunk/src/gnome-cmd-chmod-dialog.cc	Fri Feb 13 17:47:10 2009
@@ -220,9 +220,9 @@
     gtk_widget_set_sensitive (dialog->priv->recurse_combo, FALSE);
 
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CANCEL,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_CANCEL,
                                  GTK_SIGNAL_FUNC (on_cancel), dialog);
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_OK,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_OK,
                                  GTK_SIGNAL_FUNC (on_ok), dialog);
 
     gtk_signal_connect (GTK_OBJECT (dialog->priv->recurse_check), "toggled",

Modified: trunk/src/gnome-cmd-chown-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-chown-dialog.cc	(original)
+++ trunk/src/gnome-cmd-chown-dialog.cc	Fri Feb 13 17:47:10 2009
@@ -194,9 +194,9 @@
     gtk_box_pack_start (GTK_BOX (vbox), dialog->priv->recurse_check, FALSE, FALSE, 0);
 
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CANCEL,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_CANCEL,
                                  GTK_SIGNAL_FUNC (on_cancel), dialog);
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_OK,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_OK,
                                  GTK_SIGNAL_FUNC (on_ok), dialog);
 }
 

Modified: trunk/src/gnome-cmd-delete-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-delete-dialog.cc	(original)
+++ trunk/src/gnome-cmd-delete-dialog.cc	Fri Feb 13 17:47:10 2009
@@ -147,7 +147,7 @@
     bbox = create_hbuttonbox (data->progwin);
     gtk_container_add (GTK_CONTAINER (vbox), bbox);
 
-    button = create_stock_button_with_data (data->progwin, GNOME_STOCK_BUTTON_CANCEL, GTK_SIGNAL_FUNC (on_cancel), data);
+    button = create_stock_button_with_data (data->progwin, GTK_STOCK_CANCEL, GTK_SIGNAL_FUNC (on_cancel), data);
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_container_add (GTK_CONTAINER (bbox), button);
 

Modified: trunk/src/gnome-cmd-dir.cc
==============================================================================
--- trunk/src/gnome-cmd-dir.cc	(original)
+++ trunk/src/gnome-cmd-dir.cc	Fri Feb 13 17:47:10 2009
@@ -527,7 +527,7 @@
 
     gnome_cmd_dialog_add_button (
         GNOME_CMD_DIALOG (dir->dialog),
-        GNOME_STOCK_BUTTON_CANCEL,
+        GTK_STOCK_CANCEL,
         GTK_SIGNAL_FUNC (on_dir_list_cancel), dir);
 
     GtkWidget *vbox = create_vbox (dir->dialog, FALSE, 0);

Modified: trunk/src/gnome-cmd-file-selector.cc
==============================================================================
--- trunk/src/gnome-cmd-file-selector.cc	(original)
+++ trunk/src/gnome-cmd-file-selector.cc	Fri Feb 13 17:47:10 2009
@@ -1520,7 +1520,7 @@
 
     gnome_cmd_dialog_add_button (
         GNOME_CMD_DIALOG (fs->priv->con_open_dialog),
-        GNOME_STOCK_BUTTON_CANCEL,
+        GTK_STOCK_CANCEL,
         GTK_SIGNAL_FUNC (on_con_open_cancel), fs);
 
     vbox = create_vbox (fs->priv->con_open_dialog, FALSE, 0);

Modified: trunk/src/gnome-cmd-options-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-options-dialog.cc	(original)
+++ trunk/src/gnome-cmd-options-dialog.cc	Fri Feb 13 17:47:10 2009
@@ -407,7 +407,7 @@
     label = create_label (dlg, _("Cursor:"));
     table_add (table, label, 0, 4, (GtkAttachOptions) GTK_FILL);
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dlg), GNOME_STOCK_BUTTON_CLOSE,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dlg), GTK_STOCK_CLOSE,
                                  GTK_SIGNAL_FUNC (on_edit_colors_close), dlg);
 
     gtk_widget_show (dlg);
@@ -1154,9 +1154,9 @@
     if (app && gnome_cmd_app_get_target (app) != APP_TARGET_SOME_FILES)
         gtk_widget_set_sensitive (entry, FALSE);
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CANCEL,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_CANCEL,
                                  GTK_SIGNAL_FUNC (on_cancel), dialog);
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_OK,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_OK,
                                  GTK_SIGNAL_FUNC (on_ok), dialog);
 
     gtk_widget_show (dialog);
@@ -1321,11 +1321,11 @@
     gtk_widget_set_sensitive (button, FALSE);
     gtk_container_add (GTK_CONTAINER (bbox), button);
 
-    button = create_stock_button (parent, GNOME_STOCK_BUTTON_UP, GTK_SIGNAL_FUNC (on_app_move_up));
+    button = create_stock_button (parent, GTK_STOCK_GO_UP, GTK_SIGNAL_FUNC (on_app_move_up));
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_container_add (GTK_CONTAINER (bbox), button);
 
-    button = create_stock_button (parent, GNOME_STOCK_BUTTON_DOWN, GTK_SIGNAL_FUNC (on_app_move_down));
+    button = create_stock_button (parent, GTK_STOCK_GO_DOWN, GTK_SIGNAL_FUNC (on_app_move_down));
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_container_add (GTK_CONTAINER (bbox), button);
 
@@ -1511,10 +1511,10 @@
     table_add (table, entry, 1, 3, GTK_FILL);
 
     gnome_cmd_dialog_add_button (
-        GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CANCEL,
+        GNOME_CMD_DIALOG (dialog), GTK_STOCK_CANCEL,
         GTK_SIGNAL_FUNC (on_cancel), dialog);
     gnome_cmd_dialog_add_button (
-        GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_OK,
+        GNOME_CMD_DIALOG (dialog), GTK_STOCK_OK,
         GTK_SIGNAL_FUNC (on_ok), dialog);
 
     gtk_widget_show (dialog);
@@ -1650,11 +1650,11 @@
     gtk_widget_set_sensitive (button, FALSE);
     gtk_container_add (GTK_CONTAINER (bbox), button);
 
-    button = create_stock_button (parent, GNOME_STOCK_BUTTON_UP, GTK_SIGNAL_FUNC (on_device_move_up));
+    button = create_stock_button (parent, GTK_STOCK_GO_UP, GTK_SIGNAL_FUNC (on_device_move_up));
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_container_add (GTK_CONTAINER (bbox), button);
 
-    button = create_stock_button (parent, GNOME_STOCK_BUTTON_DOWN, GTK_SIGNAL_FUNC (on_device_move_down));
+    button = create_stock_button (parent, GTK_STOCK_GO_DOWN, GTK_SIGNAL_FUNC (on_device_move_down));
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_container_add (GTK_CONTAINER (bbox), button);
 
@@ -1814,7 +1814,7 @@
         gtk_label_new (_("Devices")));
 
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CLOSE,
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_CLOSE,
                                  GTK_SIGNAL_FUNC (on_options_dialog_close), dialog);
 }
 

Modified: trunk/src/gnome-cmd-patternsel-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-patternsel-dialog.cc	(original)
+++ trunk/src/gnome-cmd-patternsel-dialog.cc	Fri Feb 13 17:47:10 2009
@@ -122,8 +122,8 @@
 
     gnome_cmd_dialog_setup ( GNOME_CMD_DIALOG (dialog), mode ? _("Select Using Pattern") : _("Unselect Using Pattern"));
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CANCEL, GTK_SIGNAL_FUNC (on_cancel), dialog);
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_OK, GTK_SIGNAL_FUNC (on_ok), dialog);
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_SIGNAL_FUNC (on_cancel), dialog);
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_OK, GTK_SIGNAL_FUNC (on_ok), dialog);
 
     vbox = create_vbox (GTK_WIDGET (dialog), FALSE, 6);
     hbox = create_hbox (GTK_WIDGET (dialog), FALSE, 6);

Modified: trunk/src/gnome-cmd-prepare-xfer-dialog.cc
==============================================================================
--- trunk/src/gnome-cmd-prepare-xfer-dialog.cc	(original)
+++ trunk/src/gnome-cmd-prepare-xfer-dialog.cc	Fri Feb 13 17:47:10 2009
@@ -328,8 +328,8 @@
 
 
     // buttons
-    dialog->cancel_button = gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CANCEL, NULL, NULL);
-    dialog->ok_button = gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_OK, NULL, NULL);
+    dialog->cancel_button = gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_CANCEL, NULL, NULL);
+    dialog->ok_button = gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_OK, NULL, NULL);
 
     gtk_signal_connect_after (GTK_OBJECT (dialog->cancel_button), "clicked", GTK_SIGNAL_FUNC (on_cancel), dialog);
     gtk_signal_connect_after (GTK_OBJECT (dialog->ok_button), "clicked", GTK_SIGNAL_FUNC (on_ok), dialog);

Modified: trunk/src/gnome-cmd-xfer-progress-win.cc
==============================================================================
--- trunk/src/gnome-cmd-xfer-progress-win.cc	(original)
+++ trunk/src/gnome-cmd-xfer-progress-win.cc	Fri Feb 13 17:47:10 2009
@@ -104,7 +104,7 @@
     bbox = create_hbuttonbox (w);
     gtk_container_add (GTK_CONTAINER (vbox), bbox);
 
-    button = create_stock_button (w, GNOME_STOCK_BUTTON_CANCEL, GTK_SIGNAL_FUNC (on_cancel));
+    button = create_stock_button (w, GTK_STOCK_CANCEL, GTK_SIGNAL_FUNC (on_cancel));
     GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
     gtk_container_add (GTK_CONTAINER (bbox), button);
 }

Modified: trunk/src/plugin_manager.cc
==============================================================================
--- trunk/src/plugin_manager.cc	(original)
+++ trunk/src/plugin_manager.cc	Fri Feb 13 17:47:10 2009
@@ -450,7 +450,7 @@
 
     update_plugin_list (GTK_CLIST (avail_list), dialog);
 
-    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GNOME_STOCK_BUTTON_CLOSE, GTK_SIGNAL_FUNC(on_close), dialog);
+    gnome_cmd_dialog_add_button (GNOME_CMD_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_SIGNAL_FUNC(on_close), dialog);
     gnome_cmd_dialog_set_transient_for (GNOME_CMD_DIALOG (dialog), GTK_WINDOW (main_win));
 
     gtk_widget_set_size_request (GTK_WIDGET (dialog), 500, 300);