Merge lp:~l-admin-3/slingshot/slingshot-clear-warnings into lp:~elementary-pantheon/slingshot/trunk

[Marcus Wichelmann]

Remove unused code

Remove some unused methods and variables causing compiler warnings.

=== modified file 'lib/synapse-core/desktop-file-service.vala'
--- lib/synapse-core/desktop-file-service.vala	2014-08-21 14:08:17 +0000
+++ lib/synapse-core/desktop-file-service.vala	2015-12-30 11:29:28 +0000
@@ -332,20 +332,6 @@
       }
     }
 
-    private string? get_cache_file_name (string dir_name)
-    {
-      // FIXME: should we use this? it's Ubuntu-specific
-      string? locale = Intl.setlocale (LocaleCategory.MESSAGES, null);
-      if (locale == null) return null;
-
-      // even though this is what the patch in gnome-menus does, the name 
-      // of the file is different here (utf is uppercase)
-      string filename = "desktop.%s.cache".printf (
-        locale.replace (".UTF-8", ".utf8"));
-
-      return Path.build_filename (dir_name, filename, null);
-    }
-    
     private async void process_directory (File directory,
                                           string id_prefix,
                                           Gee.Set<File> monitored_dirs)
 
=== modified file 'src/Widgets/AppEntry.vala'
--- src/Widgets/AppEntry.vala	2015-12-22 17:07:27 +0000
+++ src/Widgets/AppEntry.vala	2015-12-30 11:29:28 +0000
@@ -126,7 +126,6 @@
 
         this.drag_end.connect ( () => {
             this.dragging = false;
-            var slingshot_app = (Gtk.Application) GLib.Application.get_default ();
         });
 
         this.drag_data_get.connect ( (ctx, sel, info, time) => {
@@ -165,11 +164,6 @@
 
         menu = new Gtk.Menu ();
 
-        // Showing a menu reverts the effect of the grab_device function.
-        menu.hide.connect (() => {
-            var slingshot_app = (Gtk.Application) GLib.Application.get_default ();
-        });
-
         foreach (var action in application.actions) {
             var menuitem = new Gtk.MenuItem.with_mnemonic (action);
             menu.add (menuitem);