Merge lp:~jeremywootten/pantheon-files/connect-server-plugin-in-sidebar into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Use network-places plugin to insert extra network category item "Connect server".
Adds infra-structure for adding plugin items with callbacks into the sidebar network category (and potentially other categories).
Removes the "Connect Server" item from the sidebar context menu.

[Danielle Foré (danrabbit)]

"Connect server" should be "Connect to Server"

I think a better icon might be "network-server" or "network-workgroup"

Also Cody's screenshot shows that there has been some kind of theme issue introduced. The widget no longer expands to fill the height of the pane

review: Needs Fixing

[lp:~jeremywootten/pantheon-files/connect-server-plugin-in-sidebar]

1594. By Jeremy Wootten on 2014-09-14

change icon, change text, make sidebar content expand

[Jeremy Wootten (jeremywootten)]

> "Connect server" should be "Connect to Server"
>
> I think a better icon might be "network-server" or "network-workgroup"
>
> Also Cody's screenshot shows that there has been some kind of theme issue
> introduced. The widget no longer expands to fill the height of the pane

OK, I have fixed these issues, using the "network-server" icon. Note that the "network-server" and "network-workgroup" icons appear the same as the one already used for "Entire Network" item (on my system).

Instead of the string "network-server", Marlin.ICON_NETWORK_SERVER should really have been used (defined in /src/View/Resources.vala) but I need the advice of a cmake expert how to make this visible to /plugins/network-places/plugin.vala

review: Needs Resubmitting

[Cody Garver (codygarver)]

You did not entirely correct "Connect to Server"

I would not bother trying to access that icon variable

Dan, are you sure there should be no ellipsis in the string? There's no such exception stated in the HIG http://elementaryos.org/docs/human-interface-guidelines/using-ellipses

review: Needs Fixing

[lp:~jeremywootten/pantheon-files/connect-server-plugin-in-sidebar]

1595. By Jeremy Wootten on 2014-09-24

Fix label text, hide irrelevant context menu items, more generic plugin interface to sidebar, upgrade to valac 0.25.4

[Jeremy Wootten (jeremywootten)]

I have now used an ellipsis in the label text as the button leads to a dialog and there is no other indication.
I have now upgraded to valac 0.25.4 so the branch lp:~jeremywootten/pantheon-files/upgrade_to_vala_0.25.4 should be merged before this one.
It is questionable whether the infobar is now needed in the network view since the same functionality is present in the sidebar.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-05 18:18:49 +0000
+++ CMakeLists.txt	2014-09-24 07:03:43 +0000
@@ -22,7 +22,7 @@
 
 find_package (Vala REQUIRED)
 include (ValaVersion)
-ensure_vala_version ("0.16.0" MINIMUM)
+ensure_vala_version ("0.25.0" MINIMUM)
 include (ValaPrecompile)
 
 IF (LIB_ONLY)

=== modified file 'libcore/AbstractSidebar.vala'
--- libcore/AbstractSidebar.vala	2014-07-12 23:39:32 +0000
+++ libcore/AbstractSidebar.vala	2014-09-24 07:03:43 +0000
@@ -18,6 +18,18 @@
 ***/
 
 namespace Marlin {
+
+    public delegate void PluginCallbackFunc (Gtk.Widget widget);
+    public enum PlaceType {
+        BUILT_IN,
+        MOUNTED_VOLUME,
+        BOOKMARK,
+        BOOKMARKS_CATEGORY,
+        PERSONAL_CATEGORY,
+        STORAGE_CATEGORY,
+        PLUGIN_ITEM
+    }
+
     public abstract class AbstractSidebar : Gtk.ScrolledWindow {
         public enum Column {
             NAME,
@@ -37,10 +49,13 @@
             SPINNER_PULSE,
             FREE_SPACE,
             DISK_SIZE,
+            PLUGIN_CALLBACK,
             COUNT
         }
 
         protected Gtk.TreeStore store;
+        protected Gtk.TreeRowReference network_category_reference;
+        protected Gtk.Box content_box;
 
         protected void init () {
             store = new Gtk.TreeStore (((int)Column.COUNT),
@@ -60,18 +75,46 @@
                                         typeof (bool),              /* Show spinner */
                                         typeof (uint),              /* Spinner pulse */
                                         typeof (uint64),            /* Free space */
-                                        typeof (uint64)             /* For disks, total size */
+                                        typeof (uint64),             /* For disks, total size */
+                                        typeof (Marlin.PluginCallbackFunc)
                                         );
-        }
-
-        public void add_extra_item (string text) {
+
+            content_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            this.add (content_box);
+            content_box.show_all ();
+        }
+
+        public void add_extra_network_item (string text, string tooltip, Icon? icon, Marlin.PluginCallbackFunc? cb) {
+            add_extra_item (network_category_reference, text, tooltip, icon, cb);
+        }
+
+        public void add_extra_item (Gtk.TreeRowReference category, string text, string tooltip, Icon? icon, Marlin.PluginCallbackFunc? cb) {
             Gtk.TreeIter iter;
-            store.append (out iter, null);
-            store.set (iter,
-                       Column.ICON, null,
-                       Column.NAME, text,
-                       Column.URI, "test://",
-                       -1);
+            store.get_iter (out iter, category.get_path ());
+            iter = add_place (PlaceType.PLUGIN_ITEM,
+                             iter,
+                             text,
+                             icon,
+                             null,
+                             null,
+                             null,
+                             null,
+                             0,
+                             tooltip);
+            if (cb != null)
+                store.@set (iter, Column.PLUGIN_CALLBACK, cb);
+
         }
+
+       protected abstract Gtk.TreeIter add_place (Marlin.PlaceType place_type,
+                                                  Gtk.TreeIter? parent,
+                                                  string name,
+                                                  Icon? icon,
+                                                  string? uri,
+                                                  Drive? drive,
+                                                  Volume? volume,
+                                                  Mount? mount,
+                                                  uint index,
+                                                  string tooltip) ;
     }
 }

=== modified file 'libcore/Plugin.vala'
--- libcore/Plugin.vala	2013-07-21 04:44:33 +0000
+++ libcore/Plugin.vala	2014-09-24 07:03:43 +0000
@@ -2,7 +2,7 @@
     public virtual void directory_loaded (void* data) { }
     public virtual void context_menu (Gtk.Widget? widget, List<GOF.File> files) { }
     public virtual void ui (Gtk.UIManager? widget) { }
-    public virtual void update_sidebar (Gtk.Widget sidebar) { }
+    public virtual void update_sidebar (Gtk.Widget widget) { }
     public virtual void update_file_info (GOF.File file) { }
 
     public Gtk.Widget window;

=== modified file 'libcore/PluginManager.vala'
--- libcore/PluginManager.vala	2014-05-17 10:37:01 +0000
+++ libcore/PluginManager.vala	2014-09-24 07:03:43 +0000
@@ -216,9 +216,9 @@
             plugin.interface_loaded (win);
     }
 
-    public void update_sidebar (Gtk.Widget win) {
+    public void update_sidebar (Gtk.Widget widget) {
         foreach (var plugin in plugin_hash.values)
-            plugin.update_sidebar (win);
+            plugin.update_sidebar (widget);
     }
 
     public void update_file_info (GOF.File file) {

=== modified file 'plugins/network-places/plugin.vala'
--- plugins/network-places/plugin.vala	2013-05-27 10:54:46 +0000
+++ plugins/network-places/plugin.vala	2014-09-24 07:03:43 +0000
@@ -42,6 +42,13 @@
             infobar.show_all ();
         }
     }
+
+    public override void update_sidebar (Gtk.Widget widget) {
+        var sidebar = widget as Marlin.AbstractSidebar;
+        sidebar.add_extra_network_item (_("Connect to Server…"), _("Connect to a network file server"),
+                                         new ThemedIcon.with_default_fallbacks ("network-server"), 
+                                         marlin_connect_server_dialog_show);
+    }
 }
 
 public Marlin.Plugins.Base module_init () {

=== modified file 'src/View/LocationBar.vala'
--- src/View/LocationBar.vala	2014-09-19 10:37:21 +0000
+++ src/View/LocationBar.vala	2014-09-24 07:03:43 +0000
@@ -354,7 +354,7 @@
                     menu_item.set_image (new Gtk.Image.from_gicon (icon, Gtk.IconSize.MENU));
                     menu_item.always_show_image = true;
                     menu_item.activate.connect (() => {
-                        unowned AppInfo app = submenu_open_with.get_active ().get_data ("appinfo");
+                        AppInfo app = submenu_open_with.get_active ().get_data ("appinfo");
                         launch_uri_with_app (app, current_right_click_path);
                     });
                     submenu_open_with.append (menu_item);
@@ -374,7 +374,7 @@
 
                 var response = dialog.run ();
                 if (response == Gtk.ResponseType.OK) {
-                    unowned AppInfo app = dialog.get_app_info ();
+                    AppInfo app = dialog.get_app_info ();
                     launch_uri_with_app (app, current_right_click_path);
                 }
 

=== modified file 'src/View/Sidebar.vala'
--- src/View/Sidebar.vala	2014-08-09 23:33:45 +0000
+++ src/View/Sidebar.vala	2014-09-24 07:03:43 +0000
@@ -22,15 +22,6 @@
 namespace Marlin.Places {
     public class Sidebar : Marlin.AbstractSidebar {
 
-        enum PlaceType {
-            BUILT_IN,
-            MOUNTED_VOLUME,
-            BOOKMARK,
-            BOOKMARKS_CATEGORY,
-            PERSONAL_CATEGORY,
-            STORAGE_CATEGORY
-        }
-
         enum ViewWindowOpenFlags {
             DEFAULT,
             NEW_TAB,
@@ -105,6 +96,7 @@
 
         Gtk.Menu popupmenu;
         Gtk.MenuItem popupmenu_open_in_new_tab_item;
+        Gtk.MenuItem popupmenu_open_in_new_window_item;
         Gtk.MenuItem popupmenu_remove_item;
         Gtk.MenuItem popupmenu_rename_item;
         Gtk.MenuItem popupmenu_separator_item1;
@@ -115,7 +107,6 @@
         Gtk.MenuItem popupmenu_rescan_item;
         Gtk.MenuItem popupmenu_format_item;
         Gtk.MenuItem popupmenu_empty_trash_item;
-        Gtk.MenuItem popupmenu_connect_server_item;
         Gtk.MenuItem popupmenu_start_item;
         Gtk.MenuItem popupmenu_stop_item;
 
@@ -139,7 +130,7 @@
             construct_tree_view ();
             configure_tree_view ();
             connect_tree_view_signals ();
-            this.add (this.tree_view);
+            this.content_box.pack_start (this.tree_view, true);
 
             this.bookmarks = Marlin.BookmarkList.get_instance ();
             bookmarks.contents_changed.connect (update_places);
@@ -301,16 +292,16 @@
                 eject_icon = new ThemedIcon.with_default_fallbacks ("media-eject-symbolic");
         }
 
-        private Gtk.TreeIter add_place (PlaceType place_type,
-                                        Gtk.TreeIter parent,
-                                        string name,
-                                        Icon? icon,
-                                        string? uri,
-                                        Drive? drive,
-                                        Volume? volume,
-                                        Mount? mount,
-                                        uint index,
-                                        string tooltip) {
+        protected override Gtk.TreeIter add_place (Marlin.PlaceType place_type,
+                                                   Gtk.TreeIter? parent,
+                                                   string name,
+                                                   Icon? icon,
+                                                   string? uri,
+                                                   Drive? drive,
+                                                   Volume? volume,
+                                                   Mount? mount,
+                                                   uint index,
+                                                   string tooltip) {
             Gtk.IconSize stock_size = Marlin.zoom_level_to_stock_icon_size (zoom_level);
             eject_spinner_cell_renderer.icon_size = stock_size;
 
@@ -324,7 +315,7 @@
             bool show_eject, show_unmount;
             check_unmount_and_eject (mount, volume, drive, out show_unmount, out show_eject);
             if (show_unmount || show_eject)
-                    assert (place_type != PlaceType.BOOKMARK);
+                    assert (place_type != Marlin.PlaceType.BOOKMARK);
 
             bool show_eject_button = false;
             if (mount != null)
@@ -356,7 +347,7 @@
                             Column.INDEX, index,
                             Column.EJECT, show_eject_button,
                             Column.NO_EJECT, !show_eject_button,
-                            Column.BOOKMARK, place_type == PlaceType.BOOKMARK,
+                            Column.BOOKMARK, place_type == Marlin.PlaceType.BOOKMARK,
                             Column.TOOLTIP, tooltip,
                             Column.EJECT_ICON, eject,
                             Column.SHOW_SPINNER, false,
@@ -386,14 +377,13 @@
                 last_selected_uri = null;
 
             store.clear ();
-            plugins.update_sidebar ((Gtk.Widget)this);
 
             /* ADD BOOKMARKS CATEGORY*/
             store.append (out iter, null);
             store.@set (iter,
                         Column.ICON, null,
                         Column.NAME, _("Personal"),
-                        Column.ROW_TYPE, PlaceType.BOOKMARKS_CATEGORY,
+                        Column.ROW_TYPE, Marlin.PlaceType.BOOKMARKS_CATEGORY,
                         Column.EJECT, false,
                         Column.NO_EJECT, true,
                         Column.BOOKMARK, false,
@@ -407,7 +397,7 @@
                 mount_uri = "";
             }
 
-            add_place (PlaceType.BUILT_IN,
+            add_place (Marlin.PlaceType.BUILT_IN,
                        iter,
                        _("Home"),
                        new ThemedIcon (Marlin.ICON_HOME),
@@ -434,7 +424,7 @@
             }
 
             /* Add trash */
-            add_place (PlaceType.BUILT_IN,
+            add_place (Marlin.PlaceType.BUILT_IN,
                        iter,
                        _("Trash"),
                        Marlin.TrashMonitor.get_icon (),
@@ -450,14 +440,14 @@
             store.@set (iter,
                         Column.ICON, null,
                         Column.NAME, _("Devices"),
-                        Column.ROW_TYPE, PlaceType.STORAGE_CATEGORY,
+                        Column.ROW_TYPE, Marlin.PlaceType.STORAGE_CATEGORY,
                         Column.EJECT, false,
                         Column.NO_EJECT, true,
                         Column.BOOKMARK, false,
                         Column.TOOLTIP, _("Your local partitions and devices"));
 
             /* Add Filesystem BUILTIN */
-            add_place (PlaceType.BUILT_IN,
+            add_place (Marlin.PlaceType.BUILT_IN,
                        iter,
                        _("File System"),
                        new ThemedIcon.with_default_fallbacks (Marlin.ICON_FILESYSTEM),
@@ -487,7 +477,7 @@
                      * in the OS to save battery juice.
                      */
                     var name = drive.get_name ();
-                    add_place (PlaceType.BUILT_IN,
+                    add_place (Marlin.PlaceType.BUILT_IN,
                                iter,
                                name,
                                drive.get_icon (),
@@ -508,7 +498,7 @@
                 var mount = volume.get_mount ();
                 if (mount != null) {
                     var root = mount.get_default_location ();
-                    add_place (PlaceType.MOUNTED_VOLUME,
+                    add_place (Marlin.PlaceType.MOUNTED_VOLUME,
                                iter,
                                mount.get_name (),
                                mount.get_icon (),
@@ -521,7 +511,7 @@
                 } else {
                 /* see comment above in why we add an icon for an unmounted mountable volume */
                     var name = volume.get_name ();
-                    add_place (PlaceType.MOUNTED_VOLUME,
+                    add_place (Marlin.PlaceType.MOUNTED_VOLUME,
                                iter,
                                name,
                                volume.get_icon (),
@@ -553,7 +543,7 @@
                     }
                 }
 
-                add_place (PlaceType.MOUNTED_VOLUME,
+                add_place (Marlin.PlaceType.MOUNTED_VOLUME,
                            iter,
                            mount.get_name (),
                            mount.get_icon (),
@@ -570,17 +560,19 @@
             store.@set (iter,
                         Column.ICON, null,
                         Column.NAME, _("Network"),
-                        Column.ROW_TYPE, PlaceType.STORAGE_CATEGORY,
+                        Column.ROW_TYPE, Marlin.PlaceType.STORAGE_CATEGORY,
                         Column.EJECT, false,
                         Column.NO_EJECT, true,
                         Column.BOOKMARK, false,
                         Column.TOOLTIP, _("Your network places"));
 
+            network_category_reference = new Gtk.TreeRowReference (store, store.get_path (iter));
+
             /* Add network mounts */
             network_mounts.reverse ();
             foreach (Mount mount in network_mounts) {
                 var root = mount.get_default_location ();
-                add_place (PlaceType.BUILT_IN,
+                add_place (Marlin.PlaceType.BUILT_IN,
                            iter,
                            mount.get_name (),
                            mount.get_icon (),
@@ -593,7 +585,7 @@
             }
 
             /* Add Entire Network BUILTIN */
-            add_place (PlaceType.BUILT_IN,
+            add_place (Marlin.PlaceType.BUILT_IN,
                        iter,
                        _("Entire Network"),
                        new GLib.ThemedIcon (Marlin.ICON_NETWORK),
@@ -604,6 +596,8 @@
                        0,
                        _("Browse the contents of the network"));
 
+            plugins.update_sidebar ((Gtk.Widget)this);
+
             expander_init_pref_state (tree_view);
 
             /* select any previously selected place or any place matching slot location */
@@ -614,7 +608,7 @@
         }
 
         private void add_bookmark (Gtk.TreeIter iter, Marlin.Bookmark bm, uint index) {
-            add_place ( PlaceType.BOOKMARK,
+            add_place ( Marlin.PlaceType.BOOKMARK,
                         iter,
                         bm.label.dup (),
                         bm.get_icon (),
@@ -635,7 +629,7 @@
                 if (mount != null) {
                     /* show mounted volume in sidebar */
                     var root = mount.get_default_location ();
-                    last_iter = add_place (PlaceType.MOUNTED_VOLUME,
+                    last_iter = add_place (Marlin.PlaceType.MOUNTED_VOLUME,
                                            iter,
                                            mount.get_name (),
                                            mount.get_icon (),
@@ -661,7 +655,7 @@
                     * he just unmounted it.
                     */
                     var name = volume.get_name ();
-                    add_place (PlaceType.MOUNTED_VOLUME,
+                    add_place (Marlin.PlaceType.MOUNTED_VOLUME,
                                iter,
                                name,
                                volume.get_icon (),
@@ -673,7 +667,7 @@
                                (_("Mount and open %s")).printf (name));
                 }
             }
-    }
+        }
 
         private void get_filesystem_space (GLib.File root, out uint64 fs_capacity, out uint64 fs_free) {
             GLib.FileInfo info;
@@ -843,14 +837,14 @@
         private bool process_drop_between (Gtk.TreeIter iter,
                                            Gtk.TreeViewDropPosition drop_pos,
                                            uint info) {
-            PlaceType type;
+            Marlin.PlaceType type;
             uint position;
             store.@get (iter,
                         Column.ROW_TYPE, out type,
                         Column.INDEX, out position);
 
-            if (type == PlaceType.BOOKMARK || type == PlaceType.BUILT_IN) {
-                if (type == PlaceType.BOOKMARK && drop_pos == Gtk.TreeViewDropPosition.BEFORE)
+            if (type == Marlin.PlaceType.BOOKMARK || type == Marlin.PlaceType.BUILT_IN) {
+                if (type == Marlin.PlaceType.BOOKMARK && drop_pos == Gtk.TreeViewDropPosition.BEFORE)
                     position--;
 
                 switch (info) {
@@ -1044,7 +1038,8 @@
                 return;
 
             string uri;
-            store.@get (iter, Column.URI, out uri);
+            Marlin.PluginCallbackFunc f;
+            store.@get (iter, Column.URI, out uri, Column.PLUGIN_CALLBACK, out f);
 
             if (uri != null) {
                 var location = File.new_for_uri (uri);
@@ -1058,6 +1053,8 @@
                     if (slot != null)
                         GLib.Signal.emit_by_name (slot.ctab, "path-changed", location);
                 }
+            } else if (f != null) {
+                f (this);
             } else if (!ejecting_or_unmounting) {
                 Drive drive;
                 Volume volume;
@@ -1199,6 +1196,7 @@
             popupmenu.append (item);
 
             item = new Gtk.ImageMenuItem.with_mnemonic (_("Open in New _Window"));
+            popupmenu_open_in_new_window_item = item;
             item.activate.connect (open_shortcut_in_new_window_cb);
             item.show ();
             popupmenu.append (item);
@@ -1246,14 +1244,6 @@
             item.activate.connect (empty_trash_cb);
             item.show ();
             popupmenu.append (item);
-
-            /* Connect to server menu item */
-            item = new Gtk.ImageMenuItem.with_mnemonic (_("Connect to Server..."));
-            popupmenu_connect_server_item = item;
-            item.activate.connect (connect_server_cb);
-            item.show ();
-            popupmenu.append (item);
-
             check_popup_sensitivity ();
         }
 
@@ -1284,7 +1274,6 @@
             popupmenu_start_item = null;
             popupmenu_stop_item = null;
             popupmenu_empty_trash_item = null;
-            popupmenu_connect_server_item = null;
         }
 
         /* Callback used for the GtkWidget::popup-menu signal of the shortcuts list */
@@ -1388,26 +1377,26 @@
                                                  Gtk.CellRenderer cell,
                                                  Gtk.TreeModel model,
                                                  Gtk.TreeIter iter) {
-            PlaceType type;
+            Marlin.PlaceType type;
             store.@get (iter, Column.ROW_TYPE, out type, -1);
 
-            if (type == PlaceType.PERSONAL_CATEGORY ||
-                type == PlaceType.STORAGE_CATEGORY ||
-                type == PlaceType.BOOKMARKS_CATEGORY)
+            if (type == Marlin.PlaceType.PERSONAL_CATEGORY ||
+                type == Marlin.PlaceType.STORAGE_CATEGORY ||
+                type == Marlin.PlaceType.BOOKMARKS_CATEGORY)
                 expander_renderer.visible = true;
             else
                 expander_renderer.visible = false;
         }
 
-        private void expander_update_pref_state (PlaceType type, bool flag) {
+        private void expander_update_pref_state (Marlin.PlaceType type, bool flag) {
             switch (type) {
-                case PlaceType.PERSONAL_CATEGORY:
+                case Marlin.PlaceType.PERSONAL_CATEGORY:
                     Preferences.settings.set_boolean ("sidebar-cat-network-expander", flag);
                     break;
-                case PlaceType.STORAGE_CATEGORY:
+                case Marlin.PlaceType.STORAGE_CATEGORY:
                     Preferences.settings.set_boolean ("sidebar-cat-devices-expander", flag);
                     break;
-                case PlaceType.BOOKMARKS_CATEGORY:
+                case Marlin.PlaceType.BOOKMARKS_CATEGORY:
                     Preferences.settings.set_boolean ("sidebar-cat-personal-expander", flag);
                     break;
             }
@@ -1438,13 +1427,13 @@
                                              Gtk.CellRenderer renderer,
                                              Gtk.TreeModel model,
                                              Gtk.TreeIter iter) {
-            PlaceType type;
+            Marlin.PlaceType type;
             Gtk.CellRendererText crt = renderer as Gtk.CellRendererText;
             model.@get (iter, Column.ROW_TYPE, out type, -1);
 
-            if (type == PlaceType.PERSONAL_CATEGORY ||
-                type == PlaceType.STORAGE_CATEGORY ||
-                type == PlaceType.BOOKMARKS_CATEGORY) {
+            if (type == Marlin.PlaceType.PERSONAL_CATEGORY ||
+                type == Marlin.PlaceType.STORAGE_CATEGORY ||
+                type == Marlin.PlaceType.BOOKMARKS_CATEGORY) {
 
                 crt.weight = 900;
                 crt.weight_set = true;
@@ -1466,7 +1455,7 @@
         private void category_row_expanded_event_cb (Gtk.TreeView tree,
                                                      Gtk.TreeIter iter,
                                                      Gtk.TreePath path) {
-            PlaceType type;
+            Marlin.PlaceType type;
             store.@get (iter, Column.ROW_TYPE, out type);
             expander_update_pref_state (type, true);
         }
@@ -1474,7 +1463,7 @@
         private void category_row_collapsed_event_cb (Gtk.TreeView tree,
                                                       Gtk.TreeIter iter,
                                                       Gtk.TreePath path) {
-            PlaceType type;
+            Marlin.PlaceType type;
             store.@get (iter, Column.ROW_TYPE, out type);
             expander_update_pref_state (type, false);
         }
@@ -1886,11 +1875,6 @@
             Marlin.FileOperations.empty_trash (window);
         }
 
-        private void connect_server_cb (Gtk.MenuItem item) {
-            var dialog = new Marlin.ConnectServer.Dialog (window);
-            dialog.show ();
-        }
-
 /* VOLUME MONITOR CALLBACK FUNCTIONS */
 
         private void mount_added_callback (Mount mount) {
@@ -2007,7 +1991,7 @@
             if (!get_selected_iter (out iter))
                 return;
 
-            PlaceType type;
+            Marlin.PlaceType type;
             Drive drive;
             Volume volume;
             Mount mount;
@@ -2039,18 +2023,18 @@
                               out show_stop);
 
             bool show_empty_trash = (uri != null) && (uri == Marlin.TRASH_URI);
-            bool show_connect_server = (uri != null) && (uri == Marlin.NETWORK_URI);
             Eel.gtk_widget_set_shown (popupmenu_separator_item2,
                                       show_eject || show_unmount ||
-                                      show_mount || show_empty_trash ||
-                                      show_connect_server);
+                                      show_mount || show_empty_trash);
             Eel.gtk_widget_set_shown (popupmenu_mount_item, show_mount);
             Eel.gtk_widget_set_shown (popupmenu_unmount_item, show_unmount);
             Eel.gtk_widget_set_shown (popupmenu_eject_item, show_eject);
             Eel.gtk_widget_set_shown (popupmenu_empty_trash_item, show_empty_trash);
             popupmenu_empty_trash_item.set_sensitive (!(Marlin.TrashMonitor.is_empty ()));
 
-            Eel.gtk_widget_set_shown (popupmenu_connect_server_item, show_connect_server);
+            bool is_plugin = (type == Marlin.PlaceType.PLUGIN_ITEM);
+            Eel.gtk_widget_set_shown (popupmenu_open_in_new_tab_item, !is_plugin);
+            Eel.gtk_widget_set_shown (popupmenu_open_in_new_window_item, !is_plugin);
         }
 
         /**