Merge lp:~ricotz/noise/source-issues into lp:~elementary-apps/noise/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
=== modified file 'core/Utils/PixbufUtils.vala'
--- core/Utils/PixbufUtils.vala 2013-08-17 04:38:12 +0000
+++ core/Utils/PixbufUtils.vala 2015-03-13 18:03:43 +0000
@@ -53,7 +53,7 @@
53 Gdk.Pixbuf? image = null;53 Gdk.Pixbuf? image = null;
54 var filestream = yield file.read_async (Priority.HIGH, c);54 var filestream = yield file.read_async (Priority.HIGH, c);
5555
56 if (filestream != null);56 if (filestream != null)
57 image = new Gdk.Pixbuf.from_stream_at_scale (filestream, width, height,57 image = new Gdk.Pixbuf.from_stream_at_scale (filestream, width, height,
58 preserve_aspect_ratio, c);58 preserve_aspect_ratio, c);
5959
6060
=== modified file 'plugins/Devices/iPod/iPodLibrary.vala'
--- plugins/Devices/iPod/iPodLibrary.vala 2015-02-24 00:04:03 +0000
+++ plugins/Devices/iPod/iPodLibrary.vala 2015-03-13 18:03:43 +0000
@@ -536,12 +536,12 @@
536 }536 }
537537
538 foreach (unowned GPod.Playlist p in db.playlists) {538 foreach (unowned GPod.Playlist p in db.playlists) {
539 if (p.contains_track (t));539 if (p.contains_track (t))
540 p.remove_track (t);540 p.remove_track (t);
541 }541 }
542542
543 foreach (unowned GPod.Playlist p in db.playlists) {543 foreach (unowned GPod.Playlist p in db.playlists) {
544 if (p.contains_track (t));544 if (p.contains_track (t))
545 p.remove_track (t);545 p.remove_track (t);
546 }546 }
547547
548548
=== modified file 'src/Dialogs/TransferFromDeviceDialog.vala'
--- src/Dialogs/TransferFromDeviceDialog.vala 2015-02-26 16:44:26 +0000
+++ src/Dialogs/TransferFromDeviceDialog.vala 2015-03-13 18:03:43 +0000
@@ -72,7 +72,7 @@
72 transferAll = new Gtk.CheckButton.with_label (_("Import all media"));72 transferAll = new Gtk.CheckButton.with_label (_("Import all media"));
73 mediasScroll = new Gtk.ScrolledWindow (null, null);73 mediasScroll = new Gtk.ScrolledWindow (null, null);
74 mediasView = new Gtk.TreeView ();74 mediasView = new Gtk.TreeView ();
75 mediasModel = new ListStore(5, typeof(bool), typeof(int), typeof(string), typeof(string), typeof(string));75 mediasModel = new Gtk.ListStore(5, typeof(bool), typeof(int), typeof(string), typeof(string), typeof(string));
76 mediasView.set_model(mediasModel);76 mediasView.set_model(mediasModel);
77 transfer = new Button.with_label(_("Import"));77 transfer = new Button.with_label(_("Import"));
78 Button cancel = new Button.with_label(_("Don't Import"));78 Button cancel = new Button.with_label(_("Don't Import"));
7979
=== modified file 'src/Widgets/ViewSelector.vala'
--- src/Widgets/ViewSelector.vala 2013-07-22 14:56:05 +0000
+++ src/Widgets/ViewSelector.vala 2015-03-13 18:03:43 +0000
@@ -86,7 +86,7 @@
86 int new_mode = mode_button.selected;86 int new_mode = mode_button.selected;
87 if (new_mode <= 2) // only consider first 3 items87 if (new_mode <= 2) // only consider first 3 items
88 selected = (Mode)new_mode;88 selected = (Mode)new_mode;
89 else if (mode_button.sensitive);89 else if (mode_button.sensitive)
90 selected = mode; // restore last valid mode90 selected = mode; // restore last valid mode
91 });91 });
92 }92 }

Subscribers

People subscribed via source and target branches