Merge lp:~david4dev/slingshot/fix-804518 into lp:~elementary-pantheon/slingshot/slingshot

[David Green]

Fixes bug 804518:
  - Slingshot now launches in the background. This makes it suitable for auto starting.
  - If the slingshot executable is run and an instance of slingshot is already running, the slingshot window will be activated. This shows the launcher without much delay.
  - Slingshot now monitors /usr/share/applications and ~/.local/share/applications so that it updates whenever launchers are added/removed (normally when installing/uninstalling apps).
  - Slingshot no longer shows/unshows the desktop. This is because I couldn't work out how to this with the new functionality. IMO this is actually better because you can still look at the windows you have open. This may be useful, for example, if one of them is a guide telling you which application to run.
  - Removed gradient to improve readability when running slingshot over windows (or light coloured wallpapers).

[lp:~david4dev/slingshot/fix-804518]

60. By David Green on 2011-08-09

If slinshot is already running, it now shows the existing instance if it is hidden and hides the existing instance if it is showing.

61. By David Green on 2011-08-10

fixed issue with slingshot showing behind windows

62. By David Green on 2011-08-10

Now shows/hides the desktop again

[xapantu (xapantu)]

Apparently, this branch has been merged separately (i.e. the branch hasn't been merged directly but parts were taken) so we have these features in the trunk now.
Thanks for your work :)

[Danielle Foré (danrabbit)]

review: Approve

=== added file 'backend/AppMonitor.vala'
--- backend/AppMonitor.vala	1970-01-01 00:00:00 +0000
+++ backend/AppMonitor.vala	2011-08-10 18:49:27 +0000
@@ -0,0 +1,37 @@
+namespace Slingshot.Backend {
+
+    public class AppMonitor : GLib.Object {
+
+        public GLib.File system_applications;
+        public GLib.File user_applications;
+
+        public GLib.FileMonitor system_monitor;
+        public GLib.FileMonitor user_monitor;
+
+        public signal void changed (GLib.File file, GLib.File? other_file, GLib.FileMonitorEvent event_type);
+
+        public void trigger_changed (GLib.File file, GLib.File? other_file, GLib.FileMonitorEvent event_type) {
+            this.changed(file, other_file, event_type);
+        }
+
+        construct {
+            this.system_applications = File.new_for_path("/usr/share/applications");
+            this.user_applications = File.new_for_path(GLib.Environment.get_user_data_dir() + "/applications");
+            try {
+                this.system_monitor = this.system_applications.monitor_directory(GLib.FileMonitorFlags.NONE);
+                this.system_monitor.changed.connect(this.trigger_changed);
+            } catch (GLib.Error e) {
+                print("Error: "+e.message+"\n");
+            }
+            try {
+                this.user_monitor = this.user_applications.monitor_directory(GLib.FileMonitorFlags.NONE);
+                this.user_monitor.changed.connect(this.trigger_changed);
+            } catch (GLib.Error e) {
+                print("Error: "+e.message+"\n");
+            }
+        }
+
+    }
+
+
+}
 
=== added file 'build'
--- build	1970-01-01 00:00:00 +0000
+++ build	2011-08-10 18:49:27 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+valac --pkg gtk+-2.0 --pkg unique-1.0 --pkg gee-1.0 --pkg gio-unix-2.0 --pkg gio-2.0 --pkg libgnome-menu --Xcc='-DGMENU_I_KNOW_THIS_IS_UNSTABLE' --pkg libwnck-1.0 --Xcc='-DWNCK_I_KNOW_THIS_IS_UNSTABLE' slingshot.vala frontend/widgets/*.vala frontend/*.vala backend/*.vala
 
=== modified file 'build_run'
--- build_run	2011-02-12 12:16:02 +0000
+++ build_run	2011-08-10 18:49:27 +0000
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-valac --pkg gtk+-2.0 --pkg unique-1.0 --pkg gee-1.0 --pkg gio-unix-2.0 --pkg libgnome-menu --Xcc='-DGMENU_I_KNOW_THIS_IS_UNSTABLE' --pkg libwnck-1.0 --Xcc='-DWNCK_I_KNOW_THIS_IS_UNSTABLE' slingshot.vala frontend/widgets/*.vala frontend/*.vala backend/*.vala
-
-sudo mv slingshot /usr/bin
-
-slingshot
+./build
+
+killall slingshot ; ./slingshot
 
=== modified file 'frontend/widgets/AppItem.vala'
--- frontend/widgets/AppItem.vala	2011-02-12 13:16:08 +0000
+++ frontend/widgets/AppItem.vala	2011-08-10 18:49:27 +0000
@@ -2,13 +2,13 @@
 namespace Slingshot.Frontend {
 
     public class AppItem : Gtk.EventBox {
-    
+
         private Gdk.Pixbuf icon;
         private Slingshot.Frontend.Color prominent;
         private string label;
         private Gtk.VBox wrapper;
         private int icon_size;
-        
+
         const int FPS = 24;
         const int DURATION = 200;
         const int RUN_LENGTH = (int)(DURATION/FPS); // total number of frames
@@ -16,44 +16,44 @@
 
         public AppItem (int size) {
             this.icon_size = size;
-            
+
             // EventBox Properties
             this.set_visible_window(false);
             this.can_focus = true;
             this.set_size_request (icon_size * 2, icon_size + 30); // 30 is the padding between icon and label and label's height
-            
+
             // VBox properties
             this.wrapper = new Gtk.VBox (false, 0);
             this.wrapper.expose_event.connect (this.draw_icon);
             this.add (this.wrapper);
-		    
-		    
+
+
 		    // Focused signals
 		    this.expose_event.connect (this.draw_background);
 		    this.focus_in_event.connect ( () => { this.focus_in (); return true;} );
 		    this.focus_out_event.connect ( () => { this.focus_out (); return true;} );
-		    
+
         }
-        
+
         public void change_app (Gdk.Pixbuf new_icon, string new_name, string new_tooltip) {
             this.current_frame = 1;
-            
+
             // Icon
             this.icon = new_icon;
             this.prominent = Slingshot.Frontend.Utilities.average_color (this.icon);
-            
+
             // Label
             this.label = new_name;
-            
+
             // Tooltip
             this.set_tooltip_text (new_tooltip);
-            
+
             // Redraw
             this.wrapper.queue_draw ();
         }
-        
+
         public new void focus_in () {
-            
+
             GLib.Timeout.add (((int)(1000/this.FPS)), () => {
 				if (this.current_frame >= this.RUN_LENGTH || !this.has_focus) {
 				    current_frame = 1;
@@ -63,11 +63,11 @@
 				this.current_frame++;
 				return true;
 			});
-            
+
         }
-        
+
         public new void focus_out () {
-            
+
             GLib.Timeout.add (((int)(1000/this.FPS)), () => {
 				if (this.current_frame >= this.RUN_LENGTH || this.has_focus) {
 				    current_frame = 1;
@@ -77,76 +77,76 @@
 				this.current_frame++;
 				return true;
 			});
-            
+
         }
-        
+
         private bool draw_icon (Gtk.Widget widget, Gdk.EventExpose event) {
             Gtk.Allocation size;
             widget.get_allocation (out size);
             var context = Gdk.cairo_create (widget.window);
-            
+
             // Draw icon
             Gdk.cairo_set_source_pixbuf (context, this.icon, size.x + ((this.icon.width - size.width) / -2.0), size.y);
             context.paint ();
-            
+
             // Truncate text
             Cairo.TextExtents extents;
             context.select_font_face ("Sans", Cairo.FontSlant.NORMAL, Cairo.FontWeight.NORMAL);
             context.set_font_size (11.5);
             Slingshot.Frontend.Utilities.truncate_text (context, size, 10, this.label, out this.label, out extents); // truncate text
-            
+
             // Draw text shadow
             context.move_to ((size.x + size.width/2 - extents.width/2) + 1, (size.y + size.height - 10) + 1);
             context.set_source_rgba (0.0, 0.0, 0.0, 0.8);
             context.show_text (this.label);
-            
-            // Draw normal text    
-            context.set_source_rgba (1.0, 1.0, 1.0, 1.0);        
+
+            // Draw normal text
+            context.set_source_rgba (1.0, 1.0, 1.0, 1.0);
             context.move_to (size.x + size.width/2 - extents.width/2, size.y + size.height - 10);
             context.show_text (this.label);
-            
+
             return false;
         }
-        
+
         private bool draw_background (Gtk.Widget widget, Gdk.EventExpose event) {
             Gtk.Allocation size;
             widget.get_allocation (out size);
             var context = Gdk.cairo_create (widget.window);
-            
+
             double progress;
             if (this.current_frame > 1) {
                 progress = (double)this.RUN_LENGTH/(double)this.current_frame;
             } else {
                 progress = 1;
             }
-            
+
             if (this.has_focus) {
-                
+
                 var linear_gradient = new Cairo.Pattern.linear (size.x, size.y, size.x, size.y + size.height);
                 linear_gradient.add_color_stop_rgba (0.0, this.prominent.R, this.prominent.G, this.prominent.B, 0.0);
                 linear_gradient.add_color_stop_rgba (0.5, this.prominent.R, this.prominent.G, this.prominent.B, 0.25/progress);
                 linear_gradient.add_color_stop_rgba (1.0, this.prominent.R, this.prominent.G, this.prominent.B, 0.4/progress);
-                
+
                 context.set_source (linear_gradient);
                 Slingshot.Frontend.Utilities.draw_rounded_rectangle (context, 10, 0.5, size);
                 context.fill ();
-                
+
             }  else  {
-                if (this.current_frame > 1) {           
+                if (this.current_frame > 1) {
                     var linear_gradient = new Cairo.Pattern.linear (size.x, size.y, size.x, size.y + size.height);
                     linear_gradient.add_color_stop_rgba (0.0, this.prominent.R, this.prominent.G, this.prominent.B, 0.0);
                     linear_gradient.add_color_stop_rgba (0.5, this.prominent.R, this.prominent.G, this.prominent.B, 0.25 - 0.25/progress);
                     linear_gradient.add_color_stop_rgba (1.0, this.prominent.R, this.prominent.G, this.prominent.B, 0.4 - 0.4/progress);
-                    
+
                     context.set_source (linear_gradient);
                     Slingshot.Frontend.Utilities.draw_rounded_rectangle (context, 10, 0.5, size);
                     context.fill ();
                 }
             }
-            
+
             return false;
         }
-        
-        
+
+
     }
 }
 
=== added file 'install'
--- install	1970-01-01 00:00:00 +0000
+++ install	2011-08-10 18:49:27 +0000
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+./build
+
+sudo mv slingshot /usr/bin/
 
=== modified file 'slingshot.vala'
--- slingshot.vala	2011-02-19 14:51:06 +0000
+++ slingshot.vala	2011-08-10 18:49:27 +0000
@@ -3,11 +3,11 @@
     public GLib.List<Slingshot.Frontend.AppItem> children = new GLib.List<Slingshot.Frontend.AppItem> ();
     public Slingshot.Frontend.Searchbar searchbar;
     public Slingshot.Frontend.Grid grid;
-    
+
     public Gee.ArrayList<Gee.HashMap<string, string>> apps = new Gee.ArrayList<Gee.HashMap<string, string>> ();
     public Gee.HashMap<string, Gdk.Pixbuf> icons = new Gee.HashMap<string, Gdk.Pixbuf>();
     public Gee.ArrayList<Gee.HashMap<string, string>> filtered = new Gee.ArrayList<Gee.HashMap<string, string>> ();
-    
+
     public Slingshot.Frontend.Indicators pages;
     public Slingshot.Frontend.Indicators categories;
     public Gee.ArrayList<GMenu.TreeDirectory> all_categories = Slingshot.Backend.GMenuEntries.get_categories ();
@@ -15,11 +15,13 @@
     public int total_pages;
     public Gtk.HBox top_spacer;
 
+    Slingshot.Backend.AppMonitor monitor;
+    public bool is_showing;
+
     public SlingshotWindow () {
-    
-        // Show desktop
-        Wnck.Screen.get_default().toggle_showing_desktop (true);
-        
+
+        this.is_showing = false;
+
         // Window properties
         this.title = "Slingshot";
         this.skip_pager_hint = true;
@@ -27,13 +29,13 @@
         this.set_type_hint (Gdk.WindowTypeHint.NORMAL);
         this.maximize ();
         this.stick ();
-        this.set_keep_above (true);
-        
+        this.set_keep_above(true);
+
         // Set icon size
         Gdk.Rectangle monitor_dimensions;
         Gdk.Screen screen = Gdk.Screen.get_default();
         screen.get_monitor_geometry(screen.get_primary_monitor(), out monitor_dimensions);
-        
+
         double suggested_size = (Math.pow (monitor_dimensions.width * monitor_dimensions.height, ((double) (1.0/3.0))) / 1.6);
         if (suggested_size < 27) {
             this.icon_size = 24;
@@ -44,22 +46,22 @@
         } else if (suggested_size >= 56) {
             this.icon_size = 64;
         }
-        
+
         // Get all apps
-        Slingshot.Backend.GMenuEntries.enumerate_apps (Slingshot.Backend.GMenuEntries.get_all (), this.icons, this.icon_size, out this.apps);
-        
+        this.refresh_apps();
+
         // Add container wrapper
         var wrapper = new Gtk.EventBox (); // used for the scrolling and button press events
         wrapper.set_visible_window (false);
         this.add (wrapper);
-        
+
         // Add container
         var container = new Gtk.VBox (false, 15);
         wrapper.add (container);
-        
+
         // Add top bar
         var top = new Gtk.HBox (false, 0);
-        
+
         this.categories = new Slingshot.Frontend.Indicators ();
         this.categories.child_activated.connect (this.change_category);
         this.categories.append ("All");
@@ -68,18 +70,18 @@
         }
         this.categories.set_active (0);
         top.pack_start (this.categories, true, true, 15);
-        
+
         this.top_spacer = new Gtk.HBox (false, 0);
         this.top_spacer.realize.connect ( () => { this.top_spacer.visible = false; } );
         this.top_spacer.can_focus = true;
         top.pack_start (this.top_spacer, false, false, 0);
-        
+
         this.searchbar = new Slingshot.Frontend.Searchbar ("Start typing to search...");
         this.searchbar.changed.connect (this.search);
         top.pack_start (this.searchbar, false, true, 15);
-        
-        container.pack_start (top, false, true, 15); 
-        
+
+        container.pack_start (top, false, true, 15);
+
         // Make icon grid and populate
         if (monitor_dimensions.width > monitor_dimensions.height) { // normal landscape orientation
             this.grid = new Slingshot.Frontend.Grid (4, 6);
@@ -87,77 +89,82 @@
             this.grid = new Slingshot.Frontend.Grid (6, 4);
         }
         container.pack_start (this.grid, true, true, 0);
-        
+
         this.populate_grid ();
-        
+
         // Add pages
         this.pages = new Slingshot.Frontend.Indicators ();
         this.pages.child_activated.connect ( () => { this.update_grid (this.filtered); } );
-        
+
         var pages_wrapper = new Gtk.HBox (false, 0);
-        pages_wrapper.set_size_request (-1, 30);        
+        pages_wrapper.set_size_request (-1, 30);
         container.pack_end (pages_wrapper, false, true, 15);
-        
+
         // Find number of pages and populate
         this.update_pages (this.apps);
         if (this.total_pages >  1) {
             pages_wrapper.pack_start (this.pages, true, false, 0);
             for (int p = 1; p <= this.total_pages; p++) {
                 this.pages.append (p.to_string ());
-            } 
+            }
         }
         this.pages.set_active (0);
-        
+
         // Signals and callbacks
-        this.button_release_event.connect ( () => { this.destroy(); return false; });
+        this.button_release_event.connect ( () => { this.hide_slingshot(); return false; });
         this.expose_event.connect (this.draw_background);
-        this.focus_out_event.connect ( () => { this.destroy(); return true; } ); // close slingshot when the window loses focus
+        this.focus_out_event.connect ( () => { this.hide_slingshot(); return true; } ); // close slingshot when the window loses focus
+
+        //set up app monitor
+        //refreshes when apps are added/removed
+        this.monitor = new Slingshot.Backend.AppMonitor();
+        this.monitor.changed.connect(this.refresh_apps);
     }
-    
-    private void populate_grid () {        
-    
+
+    private void populate_grid () {
+
         for (int r = 0; r < this.grid.n_rows; r++) {
-            
+
             for (int c = 0; c < this.grid.n_columns; c++) {
-                            
+
                 var item = new Slingshot.Frontend.AppItem (this.icon_size);
                 this.children.append (item);
-                
+
                 item.button_press_event.connect ( () => { item.grab_focus (); return true; } );
                 item.enter_notify_event.connect ( () => { item.grab_focus (); return true; } );
                 item.leave_notify_event.connect ( () => { this.top_spacer.grab_focus (); return true; } );
                 item.button_release_event.connect ( () => {
-                    
+
                     try {
                         new GLib.DesktopAppInfo.from_filename (this.filtered.get((int) (this.children.index(item) + (this.pages.active * this.grid.n_columns * this.grid.n_rows)))["desktop_file"]).launch (null, null);
-                        this.destroy();
+                        this.hide_slingshot();
                     } catch (GLib.Error e) {
                         stdout.printf("Error! Load application: " + e.message);
                     }
-                    
+
                     return true;
-                    
+
                 });
-                
+
                 this.grid.attach (item, c, c + 1, r, r + 1, Gtk.AttachOptions.EXPAND, Gtk.AttachOptions.EXPAND, 0, 0);
-                
-            } 
-        }        
+
+            }
+        }
     }
-    
-    private void update_grid (Gee.ArrayList<Gee.HashMap<string, string>> apps) {    
-        
+
+    private void update_grid (Gee.ArrayList<Gee.HashMap<string, string>> apps) {
+
         int item_iter = (int)(this.pages.active * this.grid.n_columns * this.grid.n_rows);
         for (int r = 0; r < this.grid.n_rows; r++) {
-            
+
             for (int c = 0; c < this.grid.n_columns; c++) {
-                
+
                 int table_pos = c + (r * (int)this.grid.n_columns); // position in table right now
-                
+
                 var item = this.children.nth_data(table_pos);
                 if (item_iter < apps.size) {
                     var current_item = apps.get(item_iter);
-                    
+
                     // Update app
                     if (current_item["description"] == null || current_item["description"] == "") {
                         item.change_app (icons[current_item["command"]], current_item["name"], current_item["name"]);
@@ -169,36 +176,36 @@
                 } else { // fill with a blank one
                     item.visible = false;
                 }
-                
+
                 item_iter++;
-                
+
             }
         }
-        
+
         // Update number of pages
         this.update_pages (apps);
-        
+
         // Grab first one's focus
         this.children.nth_data (0).grab_focus ();
     }
-    
+
     private void change_category () {
         this.filtered.clear ();
-        
+
         if (this.categories.active != 0) {
             Slingshot.Backend.GMenuEntries.enumerate_apps (Slingshot.Backend.GMenuEntries.get_applications_for_category (this.all_categories.get (this.categories.active - 1)), this.icons, this.icon_size, out this.filtered);
         } else {
             this.filtered.add_all (this.apps);
         }
-        
+
         this.pages.set_active (0); // go back to first page in category
     }
-    
+
     private void update_pages (Gee.ArrayList<Gee.HashMap<string, string>> apps) {
         // Find current number of pages and update count
         var num_pages = (int) (apps.size / (this.grid.n_columns * this.grid.n_rows));
         (double) apps.size % (double) (this.grid.n_columns * this.grid.n_rows) > 0 ? this.total_pages = num_pages + 1 : this.total_pages = num_pages;
-        
+
         // Update pages
         if (this.total_pages > 1) {
             this.pages.visible = true;
@@ -208,41 +215,41 @@
         } else {
             this.pages.visible = false;
         }
-        
+
     }
-    
+
     private void search() {
-        
+
         var current_text = this.searchbar.text.down ();
-        
+
         this.categories.set_active_no_signal (0); // switch to first page
         this.filtered.clear ();
-        
+
         foreach (Gee.HashMap<string, string> app in this.apps) {
             if (current_text in app["name"].down () || current_text in app["description"].down () || current_text in app["command"].down ()) {
                 this.filtered.add (app);
             }
-        }     
-        
-        this.pages.set_active (0);   
-        
+        }
+
+        this.pages.set_active (0);
+
         this.queue_draw ();
     }
-    
+
     private void page_left() {
-        
+
         if (this.pages.active >= 1) {
             this.pages.set_active (this.pages.active - 1);
         }
-        
+
     }
-    
+
     private void page_right() {
-        
+
         if ((this.pages.active + 1) < this.total_pages) {
             this.pages.set_active (this.pages.active + 1);
         }
-        
+
     }
 
     private bool draw_background (Gtk.Widget widget, Gdk.EventExpose event) {
@@ -253,21 +260,19 @@
         // Semi-dark background
         var linear_gradient = new Cairo.Pattern.linear (size.x, size.y, size.x, size.y + size.height);
         linear_gradient.add_color_stop_rgba (0.0, 0.0, 0.0, 0.0, 0.65);
-        linear_gradient.add_color_stop_rgba (0.85, 0.0, 0.0, 0.0, 0.65);
-        linear_gradient.add_color_stop_rgba (0.99, 0.0, 0.0, 0.0, 0.0);
-                
+
         context.set_source (linear_gradient);
         context.paint ();
-        
+
         return false;
     }
-    
+
     // Keyboard shortcuts
     public override bool key_press_event (Gdk.EventKey event) {
         switch (Gdk.keyval_name (event.keyval)) {
-        
+
             case "Escape":
-                this.destroy ();
+                this.hide_slingshot ();
                 return true;
             case "ISO_Left_Tab":
                 this.page_left ();
@@ -284,7 +289,10 @@
                 }
                 return true;
             case "BackSpace":
-                this.searchbar.text = this.searchbar.text.slice (0, (int) this.searchbar.text.length - 1);
+                int len = (int) this.searchbar.text.length;
+                if (len > 0) {
+                    this.searchbar.text = this.searchbar.text.slice (0,len - 1);
+                }
                 return true;
             case "Left":
                 var current_item = this.grid.get_children ().index (this.get_focus ());
@@ -292,7 +300,7 @@
                     this.page_left ();
                     return true;
                 }
-                
+
                 break;
             case "Right":
                 var current_item = this.grid.get_children ().index (this.get_focus ());
@@ -308,16 +316,16 @@
                 this.searchbar.text = this.searchbar.text + event.str;
                 break;
         }
-        
+
         base.key_press_event (event);
         return false;
-        
+
     }
-    
+
     // Scrolling left/right for pages
     public override bool scroll_event (Gdk.EventScroll event) {
         switch (event.direction.to_string()) {
-        
+
             case "GDK_SCROLL_UP":
             case "GDK_SCROLL_LEFT":
                 this.page_left ();
@@ -326,43 +334,98 @@
             case "GDK_SCROLL_RIGHT":
                 this.page_right ();
                 break;
-        
+
         }
-                
+
         return false;
     }
-    
+
+    public void refresh_apps () {
+        print("Refreshing applications list\n");
+        Slingshot.Backend.GMenuEntries.enumerate_apps (Slingshot.Backend.GMenuEntries.get_all (), this.icons, this.icon_size, out this.apps);
+    }
+
+    public void hide_slingshot () {
+        this.iconify();
+        this.categories.set_active (0);
+        this.change_category();
+        this.searchbar.text = "";
+        this.is_showing = false;
+        Wnck.Screen.get_default().toggle_showing_desktop(false);
+    }
+    
+    public void show_slingshot () {
+        Wnck.Screen.get_default().toggle_showing_desktop(true);
+        this.deiconify();
+        this.is_showing = true;
+    }
+    
+    public void toggle_slingshot () {
+        if (this.is_showing) {
+            print("Hiding slingshot.\n");
+            this.hide_slingshot();
+        } else {
+            print("Showing slingshot.\n");
+            this.show_slingshot();
+        }
+    }
+
     // Override destroy for fade out and stuff
     public new void destroy () {
         // Restore windows
-        Wnck.Screen.get_default ().toggle_showing_desktop (false);
-        
+        //Wnck.Screen.get_default ().toggle_showing_desktop (false);
+
         base.destroy();
         Gtk.main_quit();
     }
-    
-}
+
+}
+
+
+public class SlingshotApp : GLib.Object {
+    
+    Unique.App app;
+    SlingshotWindow main_win;
+    
+    public SlingshotApp (/*string[] args*/) {
+        this.app = new Unique.App("org.elementary.slingshot", null);
+        if (this.app.is_running) {
+            print("Slingshot is already running.\n");
+            Unique.Command command = Unique.Command.ACTIVATE;
+		    this.app.send_message (command, new Unique.MessageData());
+        } else {
+            this.app.message_received.connect(this.toggle);
+            this.create(/*args*/);
+        }
+    }
+    
+    public Unique.Response toggle (int command, Unique.MessageData message_data, uint time_) {
+        if (command == Unique.Command.ACTIVATE) {
+            print("Toggling slingshot.\n");
+            this.main_win.toggle_slingshot();
+        }
+        return Unique.Response.OK;
+    }
+    
+    void create (/*string[] args*/) {
+        //Gtk.init(ref args);
+        print("Starting new slingshot instance.\n");
+        this.main_win = new SlingshotWindow();
+		this.main_win.show_all();
+		this.main_win.iconify();
+		Gtk.main();
+    }
+    
+}
+
 
 int main (string[] args) {
 
-	Gtk.init (ref args);
-
-	Unique.App app = new Unique.App ("org.elementary.slingshot", null);
-	
-	if (app.is_running) { //close if already running
-		Unique.Command command = Unique.Command.NEW;
-		app.send_message (command, new Unique.MessageData());
-	} else {
-        
-		var main_win = new SlingshotWindow ();
-		main_win.show_all ();
-		
-		app.watch_window (main_win);
-		
-		Gtk.main ();
-	}
-	
+    Gtk.init(ref args); //~
+
+	new SlingshotApp(/*args*/);
+
 	return 1;
-	
+
 }