gnome-commander r2007 - in trunk: . src

[epiotr svn gnome org]

Author: epiotr
Date: Tue Aug 26 22:16:09 2008
New Revision: 2007
URL: http://svn.gnome.org/viewvc/gnome-commander?rev=2007&view=rev

Log:
Move gnome_cmd_file_selector_show_mkdir_dialog() to gnome-cmd-user-actions.cc

Modified:
   trunk/ChangeLog
   trunk/src/gnome-cmd-file-selector.cc
   trunk/src/gnome-cmd-file-selector.h
   trunk/src/gnome-cmd-list-popmenu.cc
   trunk/src/gnome-cmd-user-actions.cc

Modified: trunk/src/gnome-cmd-file-selector.cc
==============================================================================
--- trunk/src/gnome-cmd-file-selector.cc	(original)
+++ trunk/src/gnome-cmd-file-selector.cc	Tue Aug 26 22:16:09 2008
@@ -1834,19 +1834,6 @@
 }
 
 
-void gnome_cmd_file_selector_show_mkdir_dialog (GnomeCmdFileSelector *fs)
-{
-    GnomeCmdDir *dir = fs->get_directory();
-    g_return_if_fail (GNOME_CMD_IS_DIR (dir));
-
-    GtkWidget *dialog = gnome_cmd_mkdir_dialog_new (dir);
-    g_return_if_fail (GNOME_CMD_IS_DIALOG (dialog));
-
-    gtk_widget_ref (dialog);
-    gtk_widget_show (dialog);
-}
-
-
 static gboolean on_new_textfile_ok (GnomeCmdStringDialog *string_dialog, const gchar **values, GnomeCmdFileSelector *fs)
 {
     g_return_val_if_fail (GNOME_CMD_IS_FILE_SELECTOR (fs), TRUE);

Modified: trunk/src/gnome-cmd-file-selector.h
==============================================================================
--- trunk/src/gnome-cmd-file-selector.h	(original)
+++ trunk/src/gnome-cmd-file-selector.h	Tue Aug 26 22:16:09 2008
@@ -114,8 +114,6 @@
 
 void gnome_cmd_file_selector_update_style (GnomeCmdFileSelector *fs);
 
-void gnome_cmd_file_selector_show_mkdir_dialog (GnomeCmdFileSelector *fs);
-
 void gnome_cmd_file_selector_show_new_textfile_dialog (GnomeCmdFileSelector *fs);
 
 void gnome_cmd_file_selector_cap_paste (GnomeCmdFileSelector *fs);

Modified: trunk/src/gnome-cmd-list-popmenu.cc
==============================================================================
--- trunk/src/gnome-cmd-list-popmenu.cc	(original)
+++ trunk/src/gnome-cmd-list-popmenu.cc	Tue Aug 26 22:16:09 2008
@@ -40,7 +40,7 @@
 
 static void on_new_directory (GtkMenuItem *item, GnomeCmdFileSelector *fs)
 {
-    gnome_cmd_file_selector_show_mkdir_dialog (fs);
+    file_mkdir (item);
 }
 
 

Modified: trunk/src/gnome-cmd-user-actions.cc
==============================================================================
--- trunk/src/gnome-cmd-user-actions.cc	(original)
+++ trunk/src/gnome-cmd-user-actions.cc	Tue Aug 26 22:16:09 2008
@@ -33,6 +33,7 @@
 #include "gnome-cmd-con-dialog.h"
 #include "gnome-cmd-remote-dialog.h"
 #include "gnome-cmd-main-win.h"
+#include "gnome-cmd-mkdir-dialog.h"
 #include "gnome-cmd-options-dialog.h"
 #include "gnome-cmd-prepare-copy-dialog.h"
 #include "gnome-cmd-prepare-move-dialog.h"
@@ -688,7 +689,14 @@
 
 void file_mkdir (GtkMenuItem *menuitem, gpointer not_used)
 {
-    gnome_cmd_file_selector_show_mkdir_dialog (get_fs (ACTIVE));
+    GnomeCmdDir *dir = get_fs (ACTIVE)->get_directory();
+    g_return_if_fail (GNOME_CMD_IS_DIR (dir));
+
+    GtkWidget *dialog = gnome_cmd_mkdir_dialog_new (dir);
+    g_return_if_fail (GNOME_CMD_IS_DIALOG (dialog));
+
+    gtk_widget_ref (dialog);
+    gtk_widget_show (dialog);
 }