gnome-commander r2256 - in branches/gcmd-1-3: . src

[epiotr svn gnome org]

Author: epiotr
Date: Fri Oct 31 22:04:05 2008
New Revision: 2256
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2256&view=rev

Log:
Simplify code for advrename dlg invoking

Modified:
   branches/gcmd-1-3/ChangeLog
   branches/gcmd-1-3/src/gnome-cmd-file-list.cc
   branches/gcmd-1-3/src/gnome-cmd-file-list.h
   branches/gcmd-1-3/src/gnome-cmd-user-actions.cc

Modified: branches/gcmd-1-3/src/gnome-cmd-file-list.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-list.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-list.cc	Fri Oct 31 22:04:05 2008
@@ -36,7 +36,6 @@
 #include "gnome-cmd-chown-dialog.h"
 #include "gnome-cmd-chmod-dialog.h"
 #include "gnome-cmd-delete-dialog.h"
-#include "gnome-cmd-advrename-dialog.h"
 #include "gnome-cmd-quicksearch-popup.h"
 #include "gnome-cmd-file-collection.h"
 #include "gnome-cmd-user-actions.h"
@@ -1872,22 +1871,6 @@
 }
 
 
-void gnome_cmd_file_list_show_advrename_dialog (GnomeCmdFileList *fl)
-{
-    g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl));
-
-    GList *files = fl->get_selected_files();
-
-    if (files)
-    {
-        GtkWidget *dialog = gnome_cmd_advrename_dialog_new (fl->sort_selection(files));
-
-        gtk_widget_ref (dialog);
-        gtk_widget_show (dialog);
-    }
-}
-
-
 void gnome_cmd_file_list_show_properties_dialog (GnomeCmdFileList *fl)
 {
     g_return_if_fail (GNOME_CMD_IS_FILE_LIST (fl));

Modified: branches/gcmd-1-3/src/gnome-cmd-file-list.h
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-file-list.h	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-file-list.h	Fri Oct 31 22:04:05 2008
@@ -226,7 +226,6 @@
 
 void gnome_cmd_file_list_compare_directories (GnomeCmdFileList *fl1, GnomeCmdFileList *fl2);
 
-void gnome_cmd_file_list_show_advrename_dialog (GnomeCmdFileList *fl);
 void gnome_cmd_file_list_show_chmod_dialog (GnomeCmdFileList *fl);
 void gnome_cmd_file_list_show_chown_dialog (GnomeCmdFileList *fl);
 void gnome_cmd_file_list_show_delete_dialog (GnomeCmdFileList *fl);

Modified: branches/gcmd-1-3/src/gnome-cmd-user-actions.cc
==============================================================================
--- branches/gcmd-1-3/src/gnome-cmd-user-actions.cc	(original)
+++ branches/gcmd-1-3/src/gnome-cmd-user-actions.cc	Fri Oct 31 22:04:05 2008
@@ -40,6 +40,7 @@
 #include "gnome-cmd-prepare-move-dialog.h"
 #include "gnome-cmd-python-plugin.h"
 #include "gnome-cmd-search-dialog.h"
+#include "gnome-cmd-advrename-dialog.h"
 #include "gnome-cmd-key-shortcuts-dialog.h"
 #include "gnome-cmd-user-actions.h"
 #include "plugin_manager.h"
@@ -735,7 +736,19 @@
 
 void file_advrename (GtkMenuItem *menuitem, gpointer not_used)
 {
-    gnome_cmd_file_list_show_advrename_dialog (get_fl (ACTIVE));
+    GList *files = get_fl (ACTIVE)->get_selected_files();
+
+    if (files)
+    {
+        files = get_fl (ACTIVE)->sort_selection(files);
+
+        GtkWidget *dialog = gnome_cmd_advrename_dialog_new (files);
+
+        gtk_widget_ref (dialog);
+        gtk_widget_show (dialog);
+
+        g_list_free (files);
+    }
 }