Merge lp:~jeremywootten/pantheon-files/fix-1470945-open-folder-in-trash-icon-view into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Various Trash fixes (lp:1470945 lp:1470958)

This branch fixes several issues related to being able to browse folders while in trash.

1) Now works for Icon view as well
2) When not in the root folder does not not show the context menu
3) When not in the root folder changes the infobar to a warning that you need to be in the root folder for restore and empty permanently to work (it may be possible to lift this restriction in the future).
4) Gives an appropriate message on attempts to navigate to a non-existent folder in trash instead of offering to create it (which would fail).

[Cody Garver (codygarver)]

Conflicts with trunk

Also not sure about that second Welcome sentence, it might need a period, I will ask Dan.

[Danielle Foré (danrabbit)]

The period for the error messaging is backwords and the primary text should be in Title Case. So it should be

This Folder Does Not Exist
You cannot create a folder here.

[lp:~jeremywootten/pantheon-files/fix-1470945-open-folder-in-trash-icon-view]

1878. By Jeremy Wootten on 2015-07-24

Change error message to title case, move period

1879. By Jeremy Wootten on 2015-07-24

Merge trunk to r1899

1880. By Jeremy Wootten on 2015-07-24

Fix handling of expanded subdirectories in ListView when restoring parent from trash

[Jeremy Wootten (jeremywootten)]

Merged with trunk revision 1899 and conflicts resolved.

Message changed as advised by Dan.

Some terminal warnings and superfluous error dialogs that resulted when restoring an expanded folder in ListView were silenced.

=== modified file 'libcore/AbstractSlot.vala'
--- libcore/AbstractSlot.vala	2015-07-21 05:41:23 +0000
+++ libcore/AbstractSlot.vala	2015-07-24 12:00:50 +0000
@@ -38,6 +38,7 @@
         public string uri {
             get { return directory.file.uri;}
         }
+        public bool can_create {get {return directory != null && !directory.is_trash;}}
         public virtual bool locked_focus {
             get {
                 return false;
@@ -48,6 +49,9 @@
         protected int slot_number;
         protected int width;
 
+        public signal void active (bool scroll = true);
+        public signal void inactive ();
+
         public  void add_extra_widget (Gtk.Widget widget) {
             extra_location_widgets.pack_start (widget);
         }

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2015-07-12 17:50:55 +0000
+++ libcore/gof-directory-async.vala	2015-07-24 12:00:50 +0000
@@ -425,7 +425,6 @@
         file.exists = true;
         files_count = 0;
         state = State.LOADING;
-
         try {
             var e = yield this.location.enumerate_children_async (gio_attrs, 0, 0, cancellable);
             while (state == State.LOADING) {

=== modified file 'libcore/marlin-file-operations.c'
--- libcore/marlin-file-operations.c	2015-07-14 12:45:50 +0000
+++ libcore/marlin-file-operations.c	2015-07-24 12:00:50 +0000
@@ -5351,7 +5351,6 @@
                              gpointer done_callback_data)
 {
     CopyMoveJob *job;
-
     job = op_job_new (JOB_MOVE, CopyMoveJob, parent_window);
     job->is_move = TRUE;
     job->done_callback = done_callback;

=== modified file 'libcore/marlin-file-utilities.c'
--- libcore/marlin-file-utilities.c	2015-05-03 06:44:42 +0000
+++ libcore/marlin-file-utilities.c	2015-07-24 12:00:50 +0000
@@ -59,6 +59,7 @@
     GOFFile *file;
     GFile *original_file, *original_dir;
     GList *l, *m;
+    GFile *parent;
 
     directories = NULL;
 
@@ -68,36 +69,47 @@
 
     for (l = files; l != NULL; l = l->next) {
         file = GOF_FILE (l->data);
-        original_file = eel_g_file_get_trash_original_file (
-                            g_file_info_get_attribute_byte_string (file->info,
-                                                                   G_FILE_ATTRIBUTE_TRASH_ORIG_PATH));
-        original_dir = NULL;
-        if (original_file != NULL) {
-            original_dir = g_file_get_parent (original_file);
-        }
-
-        if (original_dir != NULL) {
-            if (directories == NULL) {
-                directories = g_hash_table_new_full (g_file_hash,
-                                                     (GEqualFunc) g_file_equal,
-                                                     (GDestroyNotify) g_object_unref,
-                                                     (GDestroyNotify) my_list_free_full);
-            }
-            m = g_hash_table_lookup (directories, original_dir);
-            if (m != NULL) {
-                g_hash_table_steal (directories, original_dir);
-            }
-            m = g_list_append (m, g_object_ref (file->location));
-            g_hash_table_insert (directories, original_dir, m);
-        } else if (unhandled_files != NULL) {
-            *unhandled_files = g_list_append (*unhandled_files, gof_file_ref (file));
-            if (original_dir != NULL)
-                g_object_unref (original_dir);
-        }
-
-        if (original_file != NULL)
-            g_object_unref (original_file);
-
+        /* Check it is a valid file (e.g. not a dummy row from list view) */
+        if (!(file->location != NULL && g_utf8_strlen (g_file_get_basename (file->location),2) > 0))
+            continue;
+
+        /* Check that file is in root of trash.  If not, do not try to restore
+         * (it will be restored with its parent anyway) */
+        parent = g_file_get_parent(file->location);
+        if (parent != NULL && strcmp (g_file_get_basename (parent), G_DIR_SEPARATOR_S) == 0) {
+            original_file = eel_g_file_get_trash_original_file (
+                                g_file_info_get_attribute_byte_string (file->info,
+                                                                       G_FILE_ATTRIBUTE_TRASH_ORIG_PATH));
+            original_dir = NULL;
+            if (original_file != NULL) {
+                original_dir = g_file_get_parent (original_file);
+            }
+
+            if (original_dir != NULL) {
+                if (directories == NULL) {
+                    directories = g_hash_table_new_full (g_file_hash,
+                                                         (GEqualFunc) g_file_equal,
+                                                         (GDestroyNotify) g_object_unref,
+                                                         (GDestroyNotify) my_list_free_full);
+                }
+                m = g_hash_table_lookup (directories, original_dir);
+                if (m != NULL) {
+                    g_hash_table_steal (directories, original_dir);
+                }
+                m = g_list_append (m, g_object_ref (file->location));
+                g_hash_table_insert (directories, original_dir, m);
+            } else if (unhandled_files != NULL) {
+                *unhandled_files = g_list_append (*unhandled_files, gof_file_ref (file));
+                if (original_dir != NULL)
+                    g_object_unref (original_dir);
+            }
+
+            if (original_file != NULL)
+                g_object_unref (original_file);
+
+            if (parent)
+                g_object_unref (parent);
+        }
     }
 
     return directories;
@@ -114,7 +126,6 @@
     char *message;
 
     original_dirs_hash = marlin_trashed_files_get_original_directories (files, &unhandled_files);
-
     for (l = unhandled_files; l != NULL; l = l->next) {
         file = GOF_FILE (l->data);
         message = g_strdup_printf (_("Could not determine original location of \"%s\" "),

=== modified file 'libwidgets/LocationBar.vala'
--- libwidgets/LocationBar.vala	2015-06-06 11:02:13 +0000
+++ libwidgets/LocationBar.vala	2015-07-24 12:00:50 +0000
@@ -496,8 +496,12 @@
         foreach (BreadcrumbsElement element in elements) {
                 string s = element.text;  /* element text should be an escaped string */
                 if (first) {
-                    if (s == "" || s == "file://")
+                    if (s == "")
                         newpath = "/";
+
+                    /* return valid path when browsing trash and other schemes */
+                    else if (s.contains ("://") && ! s.contains (":///"))
+                        newpath = s + "/";
                     else
                         newpath = s;
 

=== modified file 'plugins/pantheon-files-trash/plugin.vala'
--- plugins/pantheon-files-trash/plugin.vala	2015-05-18 17:16:42 +0000
+++ plugins/pantheon-files-trash/plugin.vala	2015-07-24 12:00:50 +0000
@@ -45,14 +45,13 @@
         unowned GOF.File file = ((Object[]) user_data)[2] as GOF.File;
         assert (((Object[]) user_data)[1] is GOF.AbstractSlot);
         unowned GOF.AbstractSlot slot = ((Object[]) user_data)[1] as GOF.AbstractSlot;
-
+        Gtk.InfoBar? infobar = infobars.@get (slot);
         /* Ignore directories other than trash and ignore reloading trash */
         if (file.location.get_uri_scheme () == "trash") {
-            Gtk.InfoBar? infobar = null;
             /* Only add infobar once */
-            if (!infobars.has_key (slot)) {
+            if (infobar == null) {
                 infobar = new Gtk.InfoBar ();
-                (infobar.get_content_area () as Gtk.Box).add (new Gtk.Label (_("These items may be restored or deleted from the trash.")));
+                (infobar.get_content_area () as Gtk.Box).add (new Gtk.Label (null));
                 infobar.add_button (_("Restore All"), 0);
                 infobar.add_button (_("Empty the Trash"), 1);
 
@@ -69,29 +68,27 @@
                     }
                 });
 
-                infobar.set_message_type (Gtk.MessageType.INFO);
-                infobar.set_response_sensitive (0, !TrashMonitor.is_empty ());
-                infobar.set_response_sensitive (1, !TrashMonitor.is_empty ());
-                infobar.show_all ();
-                infobar.set_visible (false);
                 slot.add_extra_widget (infobar);
                 infobars.@set (slot, infobar);
+            }
+            infobar.set_message_type (file.basename == "/" ? Gtk.MessageType.INFO :  Gtk.MessageType.WARNING);
+            string msg;
+            if (file.basename == "/")
+                msg = _("These items may be restored or deleted from the trash.");
+            else
+                msg = _("Cannot restore or delete unless in root folder");
 
-                GLib.Timeout.add (10, () => {
-                    if (!slot.get_realized ())
-                        return true;
-                    else {
-                        infobar.set_visible (!TrashMonitor.is_empty ());
-                        return false;
-                    }
-                });
-            }
-        } else {
-            var infobar = infobars.@get (slot);
-            if (infobar != null) {
-                infobar.destroy ();
-                infobars.unset (slot);
-            }
+            foreach (Gtk.Widget w in (infobar.get_content_area ()).get_children ()) {
+                if (w is Gtk.Label)
+                    (w as Gtk.Label).set_text (msg);
+            }
+            infobar.set_response_sensitive (0, !TrashMonitor.is_empty () && file.basename == "/");
+            infobar.set_response_sensitive (1, !TrashMonitor.is_empty () && file.basename == "/");
+            infobar.show_all ();
+            infobar.set_visible (!TrashMonitor.is_empty ());
+        } else if (infobar != null) {
+            infobar.destroy ();
+            infobars.unset (slot);
         }
     }
 }

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-07-22 14:46:48 +0000
+++ src/View/AbstractDirectoryView.vala	2015-07-24 12:00:50 +0000
@@ -198,7 +198,6 @@
         private Gdk.Cursor selectable_cursor;
 
         private GLib.List<GLib.AppInfo> open_with_apps;
-        protected GLib.List<GOF.Directory.Async> loaded_subdirectories = null;
 
         /*  Selected files are originally obtained with
             gtk_tree_model_get(): this function increases the reference
@@ -485,7 +484,7 @@
     /** Operations on selections */
         protected void activate_selected_items (Marlin.OpenFlag flag = Marlin.OpenFlag.DEFAULT,
                                                 GLib.List<GOF.File> selection = get_selected_files ()) {
-            if (updates_frozen || in_trash)
+            if (updates_frozen)
                 return;
 
             uint nb_elem = selection.length ();
@@ -500,33 +499,36 @@
                 return;
             }
 
-            /* launch each selected file individually ignoring selections greater than 10
-             * Do not launch with new instances of this app - open according to flag instead
-             */
-            if (nb_elem < 10 && (default_app == null || app_is_this_app (default_app))) {
-                foreach (GOF.File file in selection) {
-                    /* Prevent too rapid activation of files - causes New Tab to crash for example */
-                    if (file.is_folder ()) {
-                        /* By default, multiple folders open in new tabs */
-                        if (flag == Marlin.OpenFlag.DEFAULT)
-                            flag = Marlin.OpenFlag.NEW_TAB;
+            if (!in_trash) {
+                /* launch each selected file individually ignoring selections greater than 10
+                 * Do not launch with new instances of this app - open according to flag instead
+                 */
+                if (nb_elem < 10 && (default_app == null || app_is_this_app (default_app))) {
+                    foreach (GOF.File file in selection) {
+                        /* Prevent too rapid activation of files - causes New Tab to crash for example */
+                        if (file.is_folder ()) {
+                            /* By default, multiple folders open in new tabs */
+                            if (flag == Marlin.OpenFlag.DEFAULT)
+                                flag = Marlin.OpenFlag.NEW_TAB;
 
-                        GLib.Idle.add (() => {
-                            activate_file (file, screen, flag, false);
-                            return false;
-                        });
-                    } else
-                        GLib.Idle.add (() => {
-                            file.open_single (screen, null);
-                            return false;
-                        });
+                            GLib.Idle.add (() => {
+                                activate_file (file, screen, flag, false);
+                                return false;
+                            });
+                        } else
+                            GLib.Idle.add (() => {
+                                file.open_single (screen, null);
+                                return false;
+                            });
+                    }
+                } else if (default_app != null) {
+                    GLib.Idle.add (() => {
+                        open_files_with (default_app, selection);
+                        return false;
+                    });
                 }
-            } else if (default_app != null) {
-                GLib.Idle.add (() => {
-                    open_files_with (default_app, selection);
-                    return false;
-                });
-            }
+            } else
+                warning ("Cannot open files in trash");
         }
 
         protected void preview_selected_items () {
@@ -587,6 +589,7 @@
         protected void disconnect_directory_handlers (GOF.Directory.Async dir) {
             /* If the directory is still loading the file_loaded signal handler
             /* will not have been disconnected */
+
             if (dir.is_loading ())
                 dir.file_loaded.disconnect (on_directory_file_loaded);
 
@@ -717,8 +720,9 @@
 /*** Private methods */
     /** File operations */
 
+
         private void activate_file (GOF.File _file, Gdk.Screen? screen, Marlin.OpenFlag flag, bool only_one_file) {
-            if (updates_frozen || in_trash)
+            if (updates_frozen)
                 return;
 
             GOF.File file = _file;
@@ -750,15 +754,18 @@
 
                         break;
                 }
-            } else if (only_one_file && file.is_root_network_folder ())
-                load_location (location);
-            else if (only_one_file && file.is_executable ())
-                file.execute (screen, null, null);
-            else if (only_one_file && default_app != null)
-                file.open_single (screen, default_app);
-            else
-                warning ("Unable to activate this file.  Default app is %s",
-                         default_app != null ? default_app.get_name () : "null");
+            } else if (!in_trash) {
+                if (only_one_file && file.is_root_network_folder ())
+                    load_location (location);
+                else if (only_one_file && file.is_executable ())
+                    file.execute (screen, null, null);
+                else if (only_one_file && default_app != null)
+                    file.open_single (screen, default_app);
+                else
+                    warning ("Unable to activate this file.  Default app is %s",
+                             default_app != null ? default_app.get_name () : "null");
+            } else
+                warning ("Cannot open file in trash");
         }
 
         private void trash_or_delete_files (GLib.List<GOF.File> file_list,
@@ -1775,18 +1782,29 @@
             return true;
         }
 
+        private bool valid_selection_for_restore () {
+            foreach (GOF.File file in get_selected_files ()) {
+                if (!(file.directory.get_basename () == "/"))
+                    return false;
+            }
+            return true;
+        }
+
         private GLib.MenuModel? build_menu_selection (ref Gtk.Builder builder, bool in_trash, bool in_recent) {
             GLib.Menu menu = new GLib.Menu ();
 
             var clipboard_menu = builder.get_object ("clipboard-selection") as GLib.Menu;
 
             if (in_trash) {
-                menu.append_section (null, builder.get_object ("popup-trash-selection") as GLib.Menu);
-
-                clipboard_menu.remove (1); /* Copy */
-                clipboard_menu.remove (1); /* Paste (index updated by previous line) */
-
-                menu.append_section (null, clipboard_menu);
+                /* In trash, only show context menu when all selected files are in root folder */
+                if (valid_selection_for_restore ()) {
+                    menu.append_section (null, builder.get_object ("popup-trash-selection") as GLib.Menu);
+
+                    clipboard_menu.remove (1); /* Copy */
+                    clipboard_menu.remove (1); /* Paste (index updated by previous line) */
+
+                    menu.append_section (null, clipboard_menu);
+                }
             } else if (in_recent) {
                 var open_menu = build_menu_open (ref builder);
                 if (open_menu != null)
@@ -1835,7 +1853,10 @@
                 menu.append_section (null, builder.get_object ("properties") as GLib.MenuModel);
             }
 
-            return menu as MenuModel;
+            if (menu.get_n_items () > 0)
+                return menu as MenuModel;
+            else
+                return null;
         }
 
         private GLib.MenuModel? build_menu_background (ref Gtk.Builder builder, bool in_trash, bool in_recent) {
@@ -3171,9 +3192,7 @@
             cancel_thumbnailing ();
             cancel_drag_timer ();
             cancel_timeout (ref drag_scroll_timer_id);
-            loaded_subdirectories.@foreach ((dir) => {
-                remove_subdirectory (dir);
-            });
+            /* List View will take care of unloading subdirectories */
         }
 
         protected bool is_on_icon (int x, int y, int orig_x, int orig_y, ref bool on_helper) {
@@ -3210,8 +3229,6 @@
 
         public virtual void sync_selection () {}
         public virtual void highlight_path (Gtk.TreePath? path) {}
-        protected virtual void add_subdirectory (GOF.Directory.Async dir) {}
-        protected virtual void remove_subdirectory (GOF.Directory.Async dir) {}
 
 /** Abstract methods - must be overridden*/
         public abstract GLib.List<Gtk.TreePath> get_selected_paths () ;

=== modified file 'src/View/ListView.vala'
--- src/View/ListView.vala	2015-06-20 09:18:50 +0000
+++ src/View/ListView.vala	2015-07-24 12:00:50 +0000
@@ -29,8 +29,10 @@
             _("Modified")
         };
 
+        /* ListView manages the loading and unloading of subdirectories displayed */
         private uint unload_file_timeout_id = 0;
-        private GLib.List<GOF.File> subdirectories_to_unload = null;
+        private GLib.List<Gtk.TreeRowReference> subdirectories_to_unload = null;
+        private GLib.List<GOF.Directory.Async> loaded_subdirectories = null;
 
         public ListView (Marlin.View.Slot _slot) {
             base (_slot);
@@ -39,6 +41,7 @@
         private void connect_additional_signals () {
             tree.row_expanded.connect (on_row_expanded);
             tree.row_collapsed.connect (on_row_collapsed);
+            model.subdirectory_unloaded.connect (on_model_subdirectory_unloaded);
         }
 
         private void append_extra_tree_columns () {
@@ -70,24 +73,25 @@
         }
 
         private void on_row_expanded (Gtk.TreeIter iter, Gtk.TreePath path) {
-            GOF.Directory.Async dir;
             set_path_expanded (path, true);
-
-            if (model.load_subdirectory (path, out dir) && dir is GOF.Directory.Async)
-                add_subdirectory (dir);
+            add_subdirectory_at_path (path);
         }
 
         private void on_row_collapsed (Gtk.TreeIter iter, Gtk.TreePath path) {
-            unowned GOF.Directory.Async dir;
-            unowned GOF.File file;
             set_path_expanded (path, false);
-
-            if (model.get_directory_file (path, out dir, out file)) {
-                remove_subdirectory (dir);
-                subdirectories_to_unload.append (file);
+            schedule_unload_subdirectory_at_path (path);
+        }
+
+        private void on_model_subdirectory_unloaded (GOF.Directory.Async dir) {
+            /* ensure the model and our list of subdirectories are kept in sync */
+            remove_subdirectory (dir);
+        }
+
+        private void schedule_unload_subdirectory_at_path (Gtk.TreePath path) {
+                /* unload subdirectory from model and remove from our list of subdirectories
+                 * after a delay, in case of rapid collapsing and re-expanding of rows */
+                subdirectories_to_unload.append (new Gtk.TreeRowReference (model, path));
                 schedule_model_unload_directories ();
-            } else
-                critical ("failed to get directory/file");
         }
 
         private void set_path_expanded (Gtk.TreePath path, bool expanded) {
@@ -104,20 +108,27 @@
         }
 
         private bool unload_directories () {
-            foreach (var file in subdirectories_to_unload) {
-                Gtk.TreeIter iter;
+            foreach (var rowref in subdirectories_to_unload) {
+                Gtk.TreeIter? iter = null;
                 Gtk.TreePath path;
-
-                if (model.get_first_iter_for_file (file, out iter)) {
-                    path = ((Gtk.TreeModel)model).get_path (iter);
-                    if (path != null && !((Gtk.TreeView)tree).is_row_expanded (path))
+                if (rowref.valid ())
+                    path = rowref.get_path ();
+                else {
+                    warning ("TreeRowRef invalid when unloading subdirectory");
+                    continue;
+                }
+
+                if (((Gtk.TreeView)tree).is_row_expanded (path))
+                    continue;
+
+                if (model.get_iter (out iter, path) && iter != null)
                         model.unload_subdirectory (iter);
-                } else
+                else
                     warning ("Subdirectory to unload not found in model");
             }
 
-            subdirectories_to_unload.@foreach ((file) => {
-                subdirectories_to_unload.remove (file);
+            subdirectories_to_unload.@foreach ((rowref) => {
+                subdirectories_to_unload.remove (rowref);
             });
 
             unload_file_timeout_id = 0;
@@ -192,19 +203,28 @@
             return (Marlin.ZoomLevel)zoom;
         }
 
-        protected override void add_subdirectory (GOF.Directory.Async dir) {
-            connect_directory_handlers (dir);
-            dir.load ();
-            /* Maintain our own reference on dir, independent of the model */
-            /* Also needed for updating show hidden status */
-            loaded_subdirectories.prepend (dir);
+        private void add_subdirectory_at_path (Gtk.TreePath path) {
+            /* If a new subdirectory is loaded, connect it, load it
+             * and add it to the list of subdirectories */
+            GOF.Directory.Async? dir = null;
+            if (model.load_subdirectory (path, out dir)) {
+                if (dir != null) {
+                    connect_directory_handlers (dir);
+                    dir.load ();
+                    /* Maintain our own reference on dir, independent of the model */
+                    /* Also needed for updating show hidden status */
+                    loaded_subdirectories.prepend (dir);
+                }
+            }
         }
 
-        protected override void remove_subdirectory (GOF.Directory.Async dir) {
-            assert (dir != null);
-            disconnect_directory_handlers (dir);
-            /* Release our reference on dir */
-            loaded_subdirectories.remove (dir);
+        private void remove_subdirectory (GOF.Directory.Async? dir) {
+            if (dir != null) {
+                disconnect_directory_handlers (dir);
+                /* Release our reference on dir */
+                loaded_subdirectories.remove (dir);
+            } else
+                warning ("List View: directory null in remove_subdirectory");
         }
 
         protected override bool expand_collapse (Gtk.TreePath? path) {
@@ -244,8 +264,11 @@
         }
 
         public override void cancel () {
+            cancel_file_timeout ();
             base.cancel ();
-            cancel_file_timeout ();
+            loaded_subdirectories.@foreach ((dir) => {
+                remove_subdirectory (dir);
+            });
         }
     }
 }

=== modified file 'src/View/Miller.vala'
--- src/View/Miller.vala	2015-07-21 08:30:05 +0000
+++ src/View/Miller.vala	2015-07-24 12:00:50 +0000
@@ -197,7 +197,15 @@
         /** Called in response to slot active signal.
          *  Should not be called directly
          **/
-        private void on_slot_active (Marlin.View.Slot slot, bool scroll = true) {
+        private void on_slot_active (GOF.AbstractSlot aslot, bool scroll = true) {
+
+            Marlin.View.Slot slot;
+
+            if (!(aslot is Marlin.View.Slot))
+                return;
+            else
+                slot = aslot as Marlin.View.Slot;
+    
             if (scroll)
                 scroll_to_slot (slot);
 
@@ -210,6 +218,7 @@
             });
 
             current_slot = slot;
+            active ();
         }
 
         private void show_hidden_files_changed (bool show_hidden) {

=== modified file 'src/View/Slot.vala'
--- src/View/Slot.vala	2015-07-22 14:06:52 +0000
+++ src/View/Slot.vala	2015-07-24 12:00:50 +0000
@@ -25,8 +25,8 @@
         private FM.AbstractDirectoryView? dir_view = null;
 
         protected bool updates_frozen = false;
+
         public bool has_autosized = false;
-
         public bool is_active {get; protected set;}
 
         public unowned Marlin.View.Window window {
@@ -46,8 +46,6 @@
         public signal bool horizontal_scroll_event (double delta_x);
         public signal void frozen_changed (bool freeze);
         public signal void folder_deleted (GOF.File file, GOF.Directory.Async parent);
-        public signal void active (bool scroll = true);
-        public signal void inactive ();
 
         /* Support for multi-slot view (Miller)*/
         public Gtk.Box colpane;

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2015-07-22 14:46:48 +0000
+++ src/View/ViewContainer.vala	2015-07-24 12:00:50 +0000
@@ -163,6 +163,7 @@
                 view = new Slot (loc, this, mode);
 
             content = view.get_content_box ();
+            view.active.connect (on_slot_active);
             view_mode = mode;
             overlay_statusbar.showbar = view_mode != Marlin.ViewMode.LIST;
             load_slot_directory (view);
@@ -176,16 +177,20 @@
                 store_selection ();
                 /* Make sure async loading and thumbnailing are cancelled and signal handlers disconnected */
                 view.cancel ();
+                view.active.disconnect (on_slot_active);
 
                 add_view (mode, location);
                 /* Slot is created inactive so we activate now since we must be the current tab
                  * to have received a change mode instruction */
                 set_active_state (true);
                 window.update_top_menu ();
-
             }
         }
 
+        private void on_slot_active (GOF.AbstractSlot aslot, bool scroll) {
+            plugin_directory_loaded ();
+        }
+
         public void user_path_change_request (GLib.File loc) {
             view.user_path_change_request (loc);
         }
@@ -245,7 +250,6 @@
 
                 if (slot.directory.can_load) {
                     slot.directory.load ();
-                    plugin_directory_loaded ();
                 } else
                      directory_done_loading (slot);
 
@@ -253,8 +257,11 @@
             });
         }
 
-        private void plugin_directory_loaded () {
+        public void plugin_directory_loaded () {
             var slot = get_current_slot ();
+            if (slot == null)
+                return;
+
             Object[] data = new Object[3];
             data[0] = window;
             /* infobars are added to the view, not the active slot */
@@ -332,8 +339,12 @@
                                                            _("The server for this folder could not be located."));
                 can_show_folder = false;
             } else if (!slot.directory.file.exists) {
+                if (slot.can_create)
                     content = new DirectoryNotFound (slot.directory, this);
-                    can_show_folder = false;
+                else
+                    content = new Granite.Widgets.Welcome (_("This Folder Does Not Exist"),
+                                                           _("You cannot create a folder here."));
+                can_show_folder = false;
             } else if (selected_locations != null) {
                     view.select_glib_files (selected_locations, selected_locations.first ().data);
                     selected_locations = null;
@@ -351,6 +362,7 @@
             if (can_show_folder) {
                 ready = true;
                 content = view.get_content_box ();
+                plugin_directory_loaded ();
             }
 
             overlay_statusbar.update_hovered (null); /* Prevent empty statusbar showing */