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
1=== modified file 'lib/synapse-core/desktop-file-service.vala'
2--- lib/synapse-core/desktop-file-service.vala 2014-08-21 14:08:17 +0000
3+++ lib/synapse-core/desktop-file-service.vala 2015-12-30 11:29:28 +0000
4@@ -332,20 +332,6 @@
5 }
6 }
7
8- private string? get_cache_file_name (string dir_name)
9- {
10- // FIXME: should we use this? it's Ubuntu-specific
11- string? locale = Intl.setlocale (LocaleCategory.MESSAGES, null);
12- if (locale == null) return null;
13-
14- // even though this is what the patch in gnome-menus does, the name
15- // of the file is different here (utf is uppercase)
16- string filename = "desktop.%s.cache".printf (
17- locale.replace (".UTF-8", ".utf8"));
18-
19- return Path.build_filename (dir_name, filename, null);
20- }
21-
22 private async void process_directory (File directory,
23 string id_prefix,
24 Gee.Set<File> monitored_dirs)
25
26=== modified file 'src/Widgets/AppEntry.vala'
27--- src/Widgets/AppEntry.vala 2015-12-22 17:07:27 +0000
28+++ src/Widgets/AppEntry.vala 2015-12-30 11:29:28 +0000
29@@ -126,7 +126,6 @@
30
31 this.drag_end.connect ( () => {
32 this.dragging = false;
33- var slingshot_app = (Gtk.Application) GLib.Application.get_default ();
34 });
35
36 this.drag_data_get.connect ( (ctx, sel, info, time) => {
37@@ -165,11 +164,6 @@
38
39 menu = new Gtk.Menu ();
40
41- // Showing a menu reverts the effect of the grab_device function.
42- menu.hide.connect (() => {
43- var slingshot_app = (Gtk.Application) GLib.Application.get_default ();
44- });
45-
46 foreach (var action in application.actions) {
47 var menuitem = new Gtk.MenuItem.with_mnemonic (action);
48 menu.add (menuitem);

Subscribers

People subscribed via source and target branches