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

[xapantu]

[lp:~xapantu/wingpanel-indicator-sound/trunk]

10. By xapantu on 2015-06-05

initialize background once app_icon is initialized

11. By xapantu on 2015-06-05

Remove a call using background which is not initialized

=== 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 @@
             ainfo = new DesktopAppInfo (client.player.desktop_entry + ".desktop");
             if  (ainfo != null) {
                 app_icon = ainfo.get_icon ();
-                background = new Gtk.Image.from_gicon (app_icon, Gtk.IconSize.DIALOG);
                 app_name = ainfo.get_display_name ();
                 if  (app_name == "")
                     app_name = ainfo.get_name ();
@@ -61,8 +60,9 @@
         }
         if  (app_icon == null) {
             app_icon = new ThemedIcon ("emblem-music-symbolic");
-            background.set_from_icon_name ("emblem-music-symbolic", Gtk.IconSize.DIALOG);
         }
+                
+        background = new Gtk.Image.from_gicon (app_icon, Gtk.IconSize.DIALOG);
 
         background.margin_start = 6;
         background.margin_end = 6;
@@ -328,4 +328,4 @@
 
         return Gdk.pixbuf_get_from_surface (surface, 0, 0, mask_size, mask_size);
     }
-}
\ No newline at end of file
+}