From c567c6fa7baf46be61d90b9b8cbbf6928b368f23 Mon Sep 17 00:00:00 2001
From: Carlos Soriano <carlos.sorian89@gmail.com>
Date: Mon, 5 Jan 2015 15:56:52 +0100
Subject: nautilus-view: drop folder with selection

The user can create a folder and put the items inside as a more natural
way.
---
 src/nautilus-actions.h             |  1 -
 src/nautilus-directory-view-ui.xml |  5 -----
 src/nautilus-view.c                | 24 ------------------------
 3 files changed, 30 deletions(-)

diff --git a/src/nautilus-actions.h b/src/nautilus-actions.h
index 53726bd26..be9386c99 100644
--- a/src/nautilus-actions.h
+++ b/src/nautilus-actions.h
@@ -58,7 +58,6 @@
 #define NAUTILUS_ACTION_OTHER_APPLICATION1 "OtherApplication1"
 #define NAUTILUS_ACTION_OTHER_APPLICATION2 "OtherApplication2"
 #define NAUTILUS_ACTION_NEW_FOLDER "New Folder"
-#define NAUTILUS_ACTION_NEW_FOLDER_WITH_SELECTION "New Folder with Selection"
 #define NAUTILUS_ACTION_PROPERTIES "Properties"
 #define NAUTILUS_ACTION_PROPERTIES_ACCEL "PropertiesAccel"
 #define NAUTILUS_ACTION_LOCATION_PROPERTIES "LocationProperties"
diff --git a/src/nautilus-directory-view-ui.xml b/src/nautilus-directory-view-ui.xml
index f5d05556f..58080bffd 100644
--- a/src/nautilus-directory-view-ui.xml
+++ b/src/nautilus-directory-view-ui.xml
@@ -12,7 +12,6 @@
 <popup name="ActionMenu" accelerators="true">
   <placeholder name="New Items Placeholder">
     <menuitem name="New Folder" action="New Folder"/>
-    <menuitem name="New Folder with Selection" action="New Folder with Selection"/>
     <menu action="New Documents">
       <placeholder name="New Documents Placeholder"/>
     </menu>
@@ -53,10 +52,6 @@
   </placeholder>
 </popup>
 <popup name="selection">
-  <placeholder name="New Object Items">
-    <menuitem name="New Folder with Selection" action="New Folder with Selection"/>
-    <separator name="new folder with selection separator"/>
-  </placeholder>
   <placeholder name="Open Placeholder">
     <menuitem name="Open Item Location" action="OpenItemLocation"/>
     <menuitem name="Open" action="Open"/>
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index a890dcc72..00eb61049 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -1820,15 +1820,6 @@ action_new_folder_callback (GtkAction *action,
 	nautilus_view_new_folder (NAUTILUS_VIEW (callback_data), FALSE);
 }
 
-static void
-action_new_folder_with_selection_callback (GtkAction *action,
-					   gpointer callback_data)
-{                
-        g_assert (NAUTILUS_IS_VIEW (callback_data));
-
-	nautilus_view_new_folder (NAUTILUS_VIEW (callback_data), TRUE);
-}
-
 static void
 action_properties_callback (GtkAction *action,
 			    gpointer callback_data)
@@ -6650,10 +6641,6 @@ static const GtkActionEntry directory_view_entries[] = {
   /* label, accelerator */       N_("New _Folder"), "<control><shift>N",
   /* tooltip */                  N_("Create a new empty folder inside this folder"),
 				 G_CALLBACK (action_new_folder_callback) },
-  /* name, stock id */         { NAUTILUS_ACTION_NEW_FOLDER_WITH_SELECTION, NULL,
-  /* label, accelerator */       N_("New Folder with Selection"), NULL,
-  /* tooltip */                  N_("Create a new folder containing the selected items"),
-				 G_CALLBACK (action_new_folder_with_selection_callback) },
   /* name, stock id */         { NAUTILUS_ACTION_OPEN, NULL,
   /* label, accelerator */       N_("_Open"), "<control>o",
   /* tooltip */                  N_("Open the selected item in this window"),
@@ -7816,17 +7803,6 @@ real_update_menus (NautilusView *view)
 	gtk_action_set_sensitive (action, can_create_files);
 	gtk_action_set_visible (action, !selection_contains_recent);
 
-	action = gtk_action_group_get_action (view->details->dir_action_group,
-					      NAUTILUS_ACTION_NEW_FOLDER_WITH_SELECTION);
-	gtk_action_set_sensitive (action, can_create_files && can_delete_files && (selection_count > 1));
-	gtk_action_set_visible (action, !selection_contains_recent && (selection_count > 1));
-	label_with_underscore = g_strdup_printf (ngettext("New Folder with Selection (%'d Item)",
-							  "New Folder with Selection (%'d Items)",
-							  selection_count),
-						 selection_count);
-	g_object_set (action, "label", label_with_underscore, NULL);
-	g_free (label_with_underscore);
-
 	action = gtk_action_group_get_action (view->details->dir_action_group,
 					      NAUTILUS_ACTION_OPEN);
 	gtk_action_set_sensitive (action, selection_count != 0);
-- 
cgit v1.2.1