Merge lp:~xapantu/wingpanel-indicator-sound/trunk into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

Proposed by xapantu
Status: Merged
Merged at revision: 10
Proposed branch: lp:~xapantu/wingpanel-indicator-sound/trunk
Merge into: lp:~wingpanel-devs/wingpanel-indicator-sound/trunk
Diff against target: 29 lines (+3/-3)
1 file modified
src/Widgets/MprisGui.vala (+3/-3)
To merge this branch: bzr merge lp:~xapantu/wingpanel-indicator-sound/trunk
Reviewer Review Type Date Requested Status
WingPanel Devs Pending
Review via email: mp+261193@code.launchpad.net
To post a comment you must log in.
10. By xapantu

initialize background once app_icon is initialized

11. By xapantu

Remove a call using background which is not initialized

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Widgets/MprisGui.vala'
--- src/Widgets/MprisGui.vala 2015-06-04 10:48:06 +0000
+++ src/Widgets/MprisGui.vala 2015-06-05 10:27:56 +0000
@@ -53,7 +53,6 @@
53 ainfo = new DesktopAppInfo (client.player.desktop_entry + ".desktop");53 ainfo = new DesktopAppInfo (client.player.desktop_entry + ".desktop");
54 if (ainfo != null) {54 if (ainfo != null) {
55 app_icon = ainfo.get_icon ();55 app_icon = ainfo.get_icon ();
56 background = new Gtk.Image.from_gicon (app_icon, Gtk.IconSize.DIALOG);
57 app_name = ainfo.get_display_name ();56 app_name = ainfo.get_display_name ();
58 if (app_name == "")57 if (app_name == "")
59 app_name = ainfo.get_name ();58 app_name = ainfo.get_name ();
@@ -61,8 +60,9 @@
61 }60 }
62 if (app_icon == null) {61 if (app_icon == null) {
63 app_icon = new ThemedIcon ("emblem-music-symbolic");62 app_icon = new ThemedIcon ("emblem-music-symbolic");
64 background.set_from_icon_name ("emblem-music-symbolic", Gtk.IconSize.DIALOG);
65 }63 }
64
65 background = new Gtk.Image.from_gicon (app_icon, Gtk.IconSize.DIALOG);
6666
67 background.margin_start = 6;67 background.margin_start = 6;
68 background.margin_end = 6;68 background.margin_end = 6;
@@ -328,4 +328,4 @@
328328
329 return Gdk.pixbuf_get_from_surface (surface, 0, 0, mask_size, mask_size);329 return Gdk.pixbuf_get_from_surface (surface, 0, 0, mask_size, mask_size);
330 }330 }
331}
332\ No newline at end of file331\ No newline at end of file
332}

Subscribers

People subscribed via source and target branches

to all changes: