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

Proposed by Marcus Wichelmann on 2015-12-30
Status: Merged
Approved by: Corentin Noël on 2016-01-03
Approved revision: 620
Merged at revision: 621
Proposed branch: lp:~l-admin-3/slingshot/slingshot-clear-warnings
Merge into: lp:~elementary-pantheon/slingshot/trunk
Diff against target: 48 lines (+0/-20)
2 files modified
lib/synapse-core/desktop-file-service.vala (+0/-14)
src/Widgets/AppEntry.vala (+0/-6)
To merge this branch: bzr merge lp:~l-admin-3/slingshot/slingshot-clear-warnings
Reviewer Review Type Date Requested Status
elementary Pantheon team 2015-12-30 Pending
Review via email: mp+281424@code.launchpad.net

Commit message

Remove unused code

Description of the change

Remove some unused methods and variables causing compiler warnings.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
332 }332 }
333 }333 }
334334
335 private string? get_cache_file_name (string dir_name)
336 {
337 // FIXME: should we use this? it's Ubuntu-specific
338 string? locale = Intl.setlocale (LocaleCategory.MESSAGES, null);
339 if (locale == null) return null;
340
341 // even though this is what the patch in gnome-menus does, the name
342 // of the file is different here (utf is uppercase)
343 string filename = "desktop.%s.cache".printf (
344 locale.replace (".UTF-8", ".utf8"));
345
346 return Path.build_filename (dir_name, filename, null);
347 }
348
349 private async void process_directory (File directory,335 private async void process_directory (File directory,
350 string id_prefix,336 string id_prefix,
351 Gee.Set<File> monitored_dirs)337 Gee.Set<File> monitored_dirs)
352338
=== 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 @@
126126
127 this.drag_end.connect ( () => {127 this.drag_end.connect ( () => {
128 this.dragging = false;128 this.dragging = false;
129 var slingshot_app = (Gtk.Application) GLib.Application.get_default ();
130 });129 });
131130
132 this.drag_data_get.connect ( (ctx, sel, info, time) => {131 this.drag_data_get.connect ( (ctx, sel, info, time) => {
@@ -165,11 +164,6 @@
165164
166 menu = new Gtk.Menu ();165 menu = new Gtk.Menu ();
167166
168 // Showing a menu reverts the effect of the grab_device function.
169 menu.hide.connect (() => {
170 var slingshot_app = (Gtk.Application) GLib.Application.get_default ();
171 });
172
173 foreach (var action in application.actions) {167 foreach (var action in application.actions) {
174 var menuitem = new Gtk.MenuItem.with_mnemonic (action);168 var menuitem = new Gtk.MenuItem.with_mnemonic (action);
175 menu.add (menuitem);169 menu.add (menuitem);

Subscribers

People subscribed via source and target branches