Merge lp:~cjcurran/indicator-sound/duplicate-playlists into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Conor Curran]

Fixes bugs attached plus strips out custom icon loading for particular players and uses by default standard ubuntu playlist icon. It now looks much better (thanks Dan !)

[Ted Gould (ted)]

review: Approve

=== modified file 'data/com.canonical.indicators.sound.gschema.xml'
--- data/com.canonical.indicators.sound.gschema.xml	2011-01-27 17:25:15 +0000
+++ data/com.canonical.indicators.sound.gschema.xml	2011-03-23 14:44:47 +0000
@@ -11,7 +11,7 @@
     </key>
     <key name="interested-media-players" type="as">
       <summary>A list of applications which at some point have registered with the sound menu</summary>
-      <default>[ 'banshee-1' ]</default>
+      <default>[ 'banshee' ]</default>
       <description>
         Each media player which abides by the MPRIS2 spec will automatically appear in the menu.
         This array should contain the desktop file names (minus .desktop suffix) of applications which

=== modified file 'src/playlists-menu-item.vala'
--- src/playlists-menu-item.vala	2011-03-23 10:15:18 +0000
+++ src/playlists-menu-item.vala	2011-03-23 14:44:47 +0000
@@ -46,15 +46,13 @@
   public new void update (PlaylistDetails[] playlists)
   {
     foreach ( PlaylistDetails detail in playlists ){
-      
-      if (this.already_observed(detail)) continue;
+      // We don't want to list playlists which are for videos)'
+      if (this.already_observed(detail) || this.is_video_related(detail))
+        continue;
       
       Dbusmenu.Menuitem menuitem = new Menuitem();
       menuitem.property_set (MENUITEM_PROP_LABEL, detail.name);
-      var result = this.parse_icon_path (detail.icon_path);
-      if (result != null) {
-       menuitem.property_set (MENUITEM_PROP_ICON_NAME, (string)result);
-      }
+      menuitem.property_set (MENUITEM_PROP_ICON_NAME, "playlist-symbolic");
 
       menuitem.property_set (MENUITEM_PATH, (string)detail.path);
       menuitem.property_set_bool (MENUITEM_PROP_VISIBLE, true);
@@ -119,6 +117,13 @@
     return false;
   }
 
+  private bool is_video_related (PlaylistDetails new_detail)
+  {
+    var location = (string)new_detail.path;
+    if (location.contains ("/VideoLibrarySource/")) return true;
+    return false;
+  }
+
   public void active_playlist_update (PlaylistDetails detail)
   {
     var update = detail.name; 

=== modified file 'src/sound-service-dbus.c'
--- src/sound-service-dbus.c	2011-03-14 19:47:59 +0000
+++ src/sound-service-dbus.c	2011-03-23 14:44:47 +0000
@@ -148,11 +148,8 @@
 {
   SoundServiceDbusPrivate * priv = SOUND_SERVICE_DBUS_GET_PRIVATE(self);
   priv->root_menuitem = dbusmenu_menuitem_new();
-  g_debug("Root ID: %d", dbusmenu_menuitem_get_id(priv->root_menuitem));
+  //g_debug("Root ID: %d", dbusmenu_menuitem_get_id(priv->root_menuitem));
   DbusmenuServer *server = dbusmenu_server_new (INDICATOR_SOUND_MENU_DBUS_OBJECT_PATH);
-  const gchar* paths[] = {"/usr/share/banshee-1/icons", NULL};
-  dbusmenu_server_set_icon_paths (server,
-                                  paths);
   dbusmenu_server_set_root (server, priv->root_menuitem);
   g_object_unref (priv->root_menuitem);
   priv->device = device_new (self);

=== modified file 'src/voip-input-widget.c'
--- src/voip-input-widget.c	2011-03-22 19:53:19 +0000
+++ src/voip-input-widget.c	2011-03-23 14:44:47 +0000
@@ -97,7 +97,7 @@
   g_signal_connect(priv->ido_voip_input_slider, "slider-released", G_CALLBACK(voip_input_widget_slider_released), self);
 
   GtkWidget* primary_image = ido_scale_menu_item_get_primary_image((IdoScaleMenuItem*)priv->ido_voip_input_slider);
-  GIcon * primary_gicon = g_themed_icon_new_with_default_fallbacks("audio-input-microphone-zero-panel");
+  GIcon * primary_gicon = g_themed_icon_new_with_default_fallbacks("audio-input-microphone-low-zero-panel");
   gtk_image_set_from_gicon(GTK_IMAGE(primary_image), primary_gicon, GTK_ICON_SIZE_MENU);
   g_object_unref(primary_gicon);