Commit 7277e263 authored by William Jon McCann's avatar William Jon McCann

Remove the copy/move to HOME and DESKTOP menu items

We don't want to encourage users to put files in either place.

https://bugzilla.gnome.org/show_bug.cgi?id=676518
parent 610b15ee
......@@ -82,10 +82,6 @@
#define NAUTILUS_ACTION_PASTE_FILES_INTO "Paste Files Into"
#define NAUTILUS_ACTION_COPY_TO_NEXT_PANE "Copy to next pane"
#define NAUTILUS_ACTION_MOVE_TO_NEXT_PANE "Move to next pane"
#define NAUTILUS_ACTION_COPY_TO_HOME "Copy to Home"
#define NAUTILUS_ACTION_MOVE_TO_HOME "Move to Home"
#define NAUTILUS_ACTION_COPY_TO_DESKTOP "Copy to Desktop"
#define NAUTILUS_ACTION_MOVE_TO_DESKTOP "Move to Desktop"
#define NAUTILUS_ACTION_LOCATION_PASTE_FILES_INTO "LocationPasteFilesInto"
#define NAUTILUS_ACTION_RENAME "Rename"
#define NAUTILUS_ACTION_DUPLICATE "Duplicate"
......
......@@ -72,13 +72,9 @@
<menuitem name="Rename" action="Rename"/>
<menu action="CopyToMenu">
<menuitem name="Copy to next pane" action="Copy to next pane"/>
<menuitem name="Copy to Home" action="Copy to Home"/>
<menuitem name="Copy to Desktop" action="Copy to Desktop"/>
</menu>
<menu action="MoveToMenu">
<menuitem name="Move to next pane" action="Move to next pane"/>
<menuitem name="Copy to Home" action="Move to Home"/>
<menuitem name="Copy to Desktop" action="Move to Desktop"/>
</menu>
</placeholder>
<placeholder name="Dangerous File Items Placeholder">
......@@ -169,13 +165,9 @@
<menuitem name="Rename" action="Rename"/>
<menu action="CopyToMenu">
<menuitem name="Copy to next pane" action="Copy to next pane"/>
<menuitem name="Copy to Home" action="Copy to Home"/>
<menuitem name="Copy to Desktop" action="Copy to Desktop"/>
</menu>
<menu action="MoveToMenu">
<menuitem name="Move to next pane" action="Move to next pane"/>
<menuitem name="Copy to Home" action="Move to Home"/>
<menuitem name="Copy to Desktop" action="Move to Desktop"/>
</menu>
</placeholder>
<separator name="Dangerous separator"/>
......
......@@ -5972,58 +5972,6 @@ action_move_to_next_pane_callback (GtkAction *action, gpointer callback_data)
move_copy_selection_to_location (view, GDK_ACTION_MOVE, dest_location);
}
static void
action_copy_to_home_callback (GtkAction *action, gpointer callback_data)
{
NautilusView *view;
char *dest_location;
view = NAUTILUS_VIEW (callback_data);
dest_location = nautilus_get_home_directory_uri ();
move_copy_selection_to_location (view, GDK_ACTION_COPY, dest_location);
g_free (dest_location);
}
static void
action_move_to_home_callback (GtkAction *action, gpointer callback_data)
{
NautilusView *view;
char *dest_location;
view = NAUTILUS_VIEW (callback_data);
dest_location = nautilus_get_home_directory_uri ();
move_copy_selection_to_location (view, GDK_ACTION_MOVE, dest_location);
g_free (dest_location);
}
static void
action_copy_to_desktop_callback (GtkAction *action, gpointer callback_data)
{
NautilusView *view;
char *dest_location;
view = NAUTILUS_VIEW (callback_data);
dest_location = nautilus_get_desktop_directory_uri ();
move_copy_selection_to_location (view, GDK_ACTION_COPY, dest_location);
g_free (dest_location);
}
static void
action_move_to_desktop_callback (GtkAction *action, gpointer callback_data)
{
NautilusView *view;
char *dest_location;
view = NAUTILUS_VIEW (callback_data);
dest_location = nautilus_get_desktop_directory_uri ();
move_copy_selection_to_location (view, GDK_ACTION_MOVE, dest_location);
g_free (dest_location);
}
static void
action_cut_files_callback (GtkAction *action,
gpointer callback_data)
......@@ -7339,22 +7287,6 @@ static const GtkActionEntry directory_view_entries[] = {
/* name, stock id, label */ {NAUTILUS_ACTION_MOVE_TO_NEXT_PANE, NULL, N_("_Other pane"),
NULL, N_("Move the current selection to the other pane in the window"),
G_CALLBACK (action_move_to_next_pane_callback) },
/* name, stock id, label */ {NAUTILUS_ACTION_COPY_TO_HOME, NAUTILUS_ICON_HOME,
N_("_Home"), NULL,
N_("Copy the current selection to the home folder"),
G_CALLBACK (action_copy_to_home_callback) },
/* name, stock id, label */ {NAUTILUS_ACTION_MOVE_TO_HOME, NAUTILUS_ICON_HOME,
N_("_Home"), NULL,
N_("Move the current selection to the home folder"),
G_CALLBACK (action_move_to_home_callback) },
/* name, stock id, label */ {NAUTILUS_ACTION_COPY_TO_DESKTOP, NAUTILUS_ICON_DESKTOP,
N_("_Desktop"), NULL,
N_("Copy the current selection to the desktop"),
G_CALLBACK (action_copy_to_desktop_callback) },
/* name, stock id, label */ {NAUTILUS_ACTION_MOVE_TO_DESKTOP, NAUTILUS_ICON_DESKTOP,
N_("_Desktop"), NULL,
N_("Move the current selection to the desktop"),
G_CALLBACK (action_move_to_desktop_callback) },
};
static void
......@@ -8419,7 +8351,6 @@ real_update_menus (NautilusView *view)
gboolean show_save_search;
gboolean save_search_sensitive;
gboolean show_save_search_as;
gboolean show_desktop_target;
GtkAction *action;
GAppInfo *app;
GIcon *app_icon;
......@@ -8751,26 +8682,6 @@ real_update_menus (NautilusView *view)
NAUTILUS_ACTION_MOVE_TO_NEXT_PANE);
gtk_action_set_sensitive (action, can_delete_files && next_pane_is_writable);
show_desktop_target =
g_settings_get_boolean (gnome_background_preferences, NAUTILUS_PREFERENCES_SHOW_DESKTOP);
action = gtk_action_group_get_action (view->details->dir_action_group,
NAUTILUS_ACTION_COPY_TO_HOME);
gtk_action_set_sensitive (action, can_copy_files);
action = gtk_action_group_get_action (view->details->dir_action_group,
NAUTILUS_ACTION_COPY_TO_DESKTOP);
gtk_action_set_sensitive (action, can_copy_files);
gtk_action_set_visible (action, show_desktop_target);
action = gtk_action_group_get_action (view->details->dir_action_group,
NAUTILUS_ACTION_MOVE_TO_HOME);
gtk_action_set_sensitive (action, can_delete_files);
action = gtk_action_group_get_action (view->details->dir_action_group,
NAUTILUS_ACTION_MOVE_TO_DESKTOP);
gtk_action_set_sensitive (action, can_delete_files);
gtk_action_set_visible (action, show_desktop_target);
action = gtk_action_group_get_action (view->details->dir_action_group,
"CopyToMenu");
gtk_action_set_sensitive (action, can_copy_files);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment