Transfer ownership of clipboard and recent manager to slot toplevel interface

Author: jeremypw

libcore/Interfaces/SlotToplevelInterface.vala

@@ -23,11 +23,11 @@
 */
 
 public interface Files.SlotToplevelInterface : Gtk.Window {
-    /* Parent interface (ViewContainer or Window) */
     public virtual void folder_deleted (GLib.File file) {}
-    // public abstract unowned Gtk.Window? get_window (); // Should return main window
     public abstract unowned AbstractSlot? get_view (); // Should return current slot
     public abstract AbstractSlot? prepare_reload ();
     public abstract void free_space_change ();
     public abstract bool can_bookmark_uri (string uri);
+    public abstract unowned ClipboardManager get_clipboard_manager ();
+    public abstract unowned Gtk.RecentManager get_recent_manager ();
 }

libcore/View/BasicAbstractDirectoryView.vala

@@ -173,7 +173,8 @@ namespace Files {
         protected Gtk.ScrolledWindow scrolled_window;
         protected Gtk.Label empty_label;
         protected Gtk.Overlay overlay;
-        protected ClipboardManager clipboard;
+        protected unowned ClipboardManager clipboard;
+        protected unowned Gtk.RecentManager recent;
         protected Files.ListModel model;
         protected Files.IconRenderer icon_renderer;
         public BasicSlot slot { get; construct; }
@@ -230,7 +231,8 @@ namespace Files {
 
             child = overlay;
 
-            clipboard = ClipboardManager.get_for_display ();
+            clipboard = slot.top_level.get_clipboard_manager ();
+            recent = slot.top_level.get_recent_manager ();
 
             thumbnailer = Thumbnailer.get ();
             thumbnailer.finished.connect ((req) => {

src/Application.vala

@@ -32,7 +32,6 @@ public class Files.Application : Gtk.Application {
 
     private VolumeMonitor volume_monitor;
     private Progress.UIHandler progress_handler;
-    private Gtk.RecentManager recent;
 
     private const int MARLIN_ACCEL_MAP_SAVE_DELAY = 15;
     private const uint MAX_WINDOWS = 25;
@@ -135,7 +134,6 @@ public class Files.Application : Gtk.Application {
 
         progress_handler = new Progress.UIHandler ();
 
-        this.recent = new Gtk.RecentManager ();
 
         /* Global static variable "plugins" declared in PluginManager.vala */
         plugins = new PluginManager (Config.PLUGIN_DIR, (uint)(Posix.getuid ()));
@@ -172,9 +170,6 @@ public class Files.Application : Gtk.Application {
         set_accels_for_action ("app.quit", { "<Ctrl>Q" });
     }
 
-    public unowned Gtk.RecentManager get_recent_manager () {
-        return this.recent;
-    }
 
     public override int command_line (GLib.ApplicationCommandLine cmd) {
         unowned var options = cmd.get_options_dict ();

src/View/AbstractDirectoryView.vala

@@ -160,16 +160,13 @@ namespace Files {
             }
         }
 
-        protected unowned Gtk.RecentManager recent;
-
         protected AbstractDirectoryView (View.Slot _slot) {
             base (_slot);
         }
 
         construct {
             set_up_additional_menu_actions ();
             var app = (Files.Application)(GLib.Application.get_default ());
-            recent = app.get_recent_manager ();
             app.set_accels_for_action ("common.select-all", {"<Ctrl>A"});
             app.set_accels_for_action ("selection.invert-selection", {"<Shift><Ctrl>A"});
 

src/View/Window.vala

@@ -1527,4 +1527,22 @@ public class Files.View.Window : Hdy.ApplicationWindow, SlotToplevelInterface {
     public AbstractSlot? prepare_reload () {
         return current_container.prepare_reload ();
     }
+
+    private ClipboardManager? clipboard_manager = null;
+    public unowned ClipboardManager get_clipboard_manager () {
+        if (clipboard_manager == null) {
+            clipboard_manager = ClipboardManager.get_for_display ();
+        }
+
+        return clipboard_manager;
+    }
+
+    private Gtk.RecentManager? recent_manager;
+    public unowned Gtk.RecentManager get_recent_manager () {
+        if (recent_manager == null) {
+            recent_manager = new Gtk.RecentManager ();
+        }
+
+        return recent_manager;
+    }
 }