[gnome-commander] Removes 'Open folder' command in popup menu and user actions

[Uwe Scholz <uwescholz src gnome org>]

commit 64d76ec13f277850065f1278b0ca910eeb02ff98
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Sat Jul 16 22:02:59 2016 +0200

    Removes 'Open folder' command in popup menu and user actions

 NEWS                          |    2 +
 doc/C/releases.xml            |    8 ++
 pixmaps/Makefile.am           |    1 -
 pixmaps/nautilus.svg          |  275 -----------------------------------------
 src/gnome-cmd-file-popmenu.cc |    1 -
 src/gnome-cmd-list-popmenu.cc |    1 -
 src/gnome-cmd-user-actions.cc |   37 ------
 src/gnome-cmd-user-actions.h  |    2 -
 8 files changed, 10 insertions(+), 317 deletions(-)
---
diff --git a/NEWS b/NEWS
index 6871350..d970125 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,8 @@ New features:
  * Started usage of google test framework for unit tests
  * New color theme 'Winter'
  * Code cleanup
+Other changes:
+ * Removed "Open folder" command in popup menu and user actions
 New or updated translations: 
      ...
 New key bindings:
diff --git a/doc/C/releases.xml b/doc/C/releases.xml
index a617241..645a220 100644
--- a/doc/C/releases.xml
+++ b/doc/C/releases.xml
@@ -84,6 +84,14 @@
                         </listitem>
                     </itemizedlist>
                 </para>
+                <para>Other changes:</para>
+                <para>
+                    <itemizedlist>
+                        <listitem>
+                            <para>Removed "Open folder" command in popup menu and user actions</para>
+                        </listitem>
+                    </itemizedlist>
+                </para>
             </entry>
         </row>
         <row valign="top">
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index e269167..c56f333 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -19,7 +19,6 @@ pixmaps_DATA = \
        gnome-commander.xpm \
        internal-viewer.xpm \
        menu_bookmark.xpm \
-       nautilus.svg \
        overlay_symlink.xpm \
        overlay_umount.xpm \
        pin.png \
diff --git a/src/gnome-cmd-file-popmenu.cc b/src/gnome-cmd-file-popmenu.cc
index 62517a4..3451ce4 100644
--- a/src/gnome-cmd-file-popmenu.cc
+++ b/src/gnome-cmd-file-popmenu.cc
@@ -515,7 +515,6 @@ GtkWidget *gnome_cmd_file_popmenu_new (GnomeCmdFileList *fl)
         GNOMEUIINFO_SEPARATOR,
         GNOMEUIINFO_ITEM_NONE (N_("Rename"), NULL, on_rename),
         GNOMEUIINFO_ITEM_STOCK(N_("Send files"), NULL, file_sendto, GTK_STOCK_EXECUTE),
-        GNOMEUIINFO_ITEM_FILENAME (N_("Open this _folder"), NULL, command_open_nautilus, PACKAGE_NAME 
G_DIR_SEPARATOR_S "nautilus.svg"),
         GNOMEUIINFO_ITEM_FILENAME (N_("Open _terminal here"), NULL, command_open_terminal__internal, 
PACKAGE_NAME G_DIR_SEPARATOR_S "terminal.svg"),
         GNOMEUIINFO_SEPARATOR,
         GNOMEUIINFO_ITEM_STOCK(N_("_Properties..."), NULL, on_properties, GTK_STOCK_PROPERTIES),
diff --git a/src/gnome-cmd-list-popmenu.cc b/src/gnome-cmd-list-popmenu.cc
index 5c49c94..c032dfe 100644
--- a/src/gnome-cmd-list-popmenu.cc
+++ b/src/gnome-cmd-list-popmenu.cc
@@ -115,7 +115,6 @@ GtkWidget *gnome_cmd_list_popmenu_new (GnomeCmdFileSelector *fs)
         GNOMEUIINFO_SUBTREE(N_("_New"), new_uiinfo),
         GNOMEUIINFO_ITEM_STOCK(N_("_Paste"), NULL, on_paste, GTK_STOCK_PASTE),
         GNOMEUIINFO_SEPARATOR,
-        GNOMEUIINFO_ITEM_FILENAME (N_("Open this _folder"), NULL, command_open_nautilus_in_cwd, PACKAGE_NAME 
G_DIR_SEPARATOR_S "nautilus.svg"),
         GNOMEUIINFO_ITEM_FILENAME (N_("Open _terminal here"), NULL, command_open_terminal__internal, 
PACKAGE_NAME G_DIR_SEPARATOR_S "terminal.svg"),
         GNOMEUIINFO_SEPARATOR,
         GNOMEUIINFO_ITEM_STOCK(N_("_Refresh"), NULL, on_refresh, GTK_STOCK_REFRESH),
diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 851faa9..0bbc989 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -146,7 +146,6 @@ static UserActionData user_actions_data[] = {
                                              {bookmarks_edit, "bookmarks.edit", N_("Manage bookmarks")},
                                              {bookmarks_goto, "bookmarks.goto", N_("Go to bookmarked 
location")},
                                              {command_execute, "command.execute", N_("Execute command")},
-                                             {command_open_nautilus, "command.open_folder", N_("Open 
folder")},
                                              {command_open_terminal, "command.open_terminal", N_("Open 
terminal")},
                                              {command_open_terminal_as_root, 
"command.open_terminal_as_root", N_("Open terminal as root")},
                                              {command_root_mode, "command.root_mode", N_("Start GNOME 
Commander as root")},
@@ -1263,42 +1262,6 @@ void command_open_terminal_as_root (GtkMenuItem *menuitem, gpointer not_used)
 }
 
 
-inline void open_uri_in_nautilus (gchar *uri)
-{
-    if (!uri)
-        return;
-
-    char const *argv[5];
-
-    argv[0] = "nautilus";
-    argv[1] = "--no-desktop";
-    argv[2] = "--no-default-window";
-    argv[3] = uri;
-    argv[4] = NULL;
-
-    GError *error = NULL;
-
-    if (!g_spawn_async (NULL, (char **) argv, NULL, GSpawnFlags (G_SPAWN_SEARCH_PATH | 
G_SPAWN_STDOUT_TO_DEV_NULL), NULL, NULL, NULL, &error))
-        gnome_cmd_error_message (_("Unable to start Nautilus."), error);
-
-    g_free (uri);
-}
-
-
-void command_open_nautilus (GtkMenuItem *menuitem, gpointer not_used)
-{
-    GnomeCmdFile *f = get_fl (ACTIVE)->get_selected_file();
-
-    open_uri_in_nautilus ((GNOME_CMD_IS_DIR (f) ? f : GNOME_CMD_FILE (get_fs 
(ACTIVE)->get_directory()))->get_uri_str());
-}
-
-
-void command_open_nautilus_in_cwd (GtkMenuItem *menuitem, gpointer not_used)
-{
-    open_uri_in_nautilus (GNOME_CMD_FILE (get_fs (ACTIVE)->get_directory())->get_uri_str());
-}
-
-
 void command_root_mode (GtkMenuItem *menuitem, gpointer not_used)
 {
     int argc = 1;
diff --git a/src/gnome-cmd-user-actions.h b/src/gnome-cmd-user-actions.h
index b6090ad..51251b0 100644
--- a/src/gnome-cmd-user-actions.h
+++ b/src/gnome-cmd-user-actions.h
@@ -274,8 +274,6 @@ GNOME_CMD_USER_ACTION(command_execute);
 GNOME_CMD_USER_ACTION(command_open_terminal__internal);             // this function is NOT exposed to user 
as UserAction
 GNOME_CMD_USER_ACTION(command_open_terminal);
 GNOME_CMD_USER_ACTION(command_open_terminal_as_root);
-GNOME_CMD_USER_ACTION(command_open_nautilus);
-GNOME_CMD_USER_ACTION(command_open_nautilus_in_cwd);
 GNOME_CMD_USER_ACTION(command_root_mode);
 
 /************** View Menu **************/