Noise

Merge lp:~ricotz/noise/source-issues into lp:~elementary-apps/noise/trunk

  1. source-issues
  2. Merge into trunk
Proposed by Rico Tzschichholz
Status: Merged
Approved by: Danielle Foré
Approved revision: 1782
Merged at revision: 1782
Proposed branch: lp:~ricotz/noise/source-issues
Merge into: lp:~elementary-apps/noise/trunk
Diff against target: 57 lines (+5/-5)
4 files modified
core/Utils/PixbufUtils.vala (+1/-1)
plugins/Devices/iPod/iPodLibrary.vala (+2/-2)
src/Dialogs/TransferFromDeviceDialog.vala (+1/-1)
src/Widgets/ViewSelector.vala (+1/-1)
To merge this branch: bzr merge lp:~ricotz/noise/source-issues
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+252937@code.launchpad.net

Commit message

Fixing several code issues discovered by valac 0.27.1+

Description of the change

Fixing several code issues discovered by valac 0.27.1+

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 'core/Utils/PixbufUtils.vala'
2--- core/Utils/PixbufUtils.vala 2013-08-17 04:38:12 +0000
3+++ core/Utils/PixbufUtils.vala 2015-03-13 18:03:43 +0000
4@@ -53,7 +53,7 @@
5 Gdk.Pixbuf? image = null;
6 var filestream = yield file.read_async (Priority.HIGH, c);
7
8- if (filestream != null);
9+ if (filestream != null)
10 image = new Gdk.Pixbuf.from_stream_at_scale (filestream, width, height,
11 preserve_aspect_ratio, c);
12
13
14=== modified file 'plugins/Devices/iPod/iPodLibrary.vala'
15--- plugins/Devices/iPod/iPodLibrary.vala 2015-02-24 00:04:03 +0000
16+++ plugins/Devices/iPod/iPodLibrary.vala 2015-03-13 18:03:43 +0000
17@@ -536,12 +536,12 @@
18 }
19
20 foreach (unowned GPod.Playlist p in db.playlists) {
21- if (p.contains_track (t));
22+ if (p.contains_track (t))
23 p.remove_track (t);
24 }
25
26 foreach (unowned GPod.Playlist p in db.playlists) {
27- if (p.contains_track (t));
28+ if (p.contains_track (t))
29 p.remove_track (t);
30 }
31
32
33=== modified file 'src/Dialogs/TransferFromDeviceDialog.vala'
34--- src/Dialogs/TransferFromDeviceDialog.vala 2015-02-26 16:44:26 +0000
35+++ src/Dialogs/TransferFromDeviceDialog.vala 2015-03-13 18:03:43 +0000
36@@ -72,7 +72,7 @@
37 transferAll = new Gtk.CheckButton.with_label (_("Import all media"));
38 mediasScroll = new Gtk.ScrolledWindow (null, null);
39 mediasView = new Gtk.TreeView ();
40- mediasModel = new ListStore(5, typeof(bool), typeof(int), typeof(string), typeof(string), typeof(string));
41+ mediasModel = new Gtk.ListStore(5, typeof(bool), typeof(int), typeof(string), typeof(string), typeof(string));
42 mediasView.set_model(mediasModel);
43 transfer = new Button.with_label(_("Import"));
44 Button cancel = new Button.with_label(_("Don't Import"));
45
46=== modified file 'src/Widgets/ViewSelector.vala'
47--- src/Widgets/ViewSelector.vala 2013-07-22 14:56:05 +0000
48+++ src/Widgets/ViewSelector.vala 2015-03-13 18:03:43 +0000
49@@ -86,7 +86,7 @@
50 int new_mode = mode_button.selected;
51 if (new_mode <= 2) // only consider first 3 items
52 selected = (Mode)new_mode;
53- else if (mode_button.sensitive);
54+ else if (mode_button.sensitive)
55 selected = mode; // restore last valid mode
56 });
57 }

Subscribers

People subscribed via source and target branches