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

[Conor Curran]

Fixed

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/sound-service-dbus.c'
--- src/sound-service-dbus.c	2011-03-01 11:23:15 +0000
+++ src/sound-service-dbus.c	2011-03-07 15:28:35 +0000
@@ -74,6 +74,8 @@
                                                      gchar* player_name,
                                                      gboolean blacklist); 
 
+static gboolean sound_service_dbus_is_blacklisted (SoundServiceDbus* self,
+                                                   gchar* player_name);
 
 G_DEFINE_TYPE (SoundServiceDbus, sound_service_dbus, G_TYPE_OBJECT);
 
@@ -281,7 +283,16 @@
                                                            player_name,
                                                            blacklist);
     retval =  g_variant_new ("(b)", result);
-  }     
+  }
+  else if (g_strcmp0(method, "IsBlacklisted") == 0) {
+    gchar* player_name;
+    g_variant_get (params, "(s)", &player_name);
+
+    g_debug ("IsBlacklisted - name %s", player_name);
+    gboolean result = sound_service_dbus_is_blacklisted (service,
+                                                         player_name);
+    retval =  g_variant_new ("(b)", result);
+  }
   else {
     g_warning("Calling method '%s' on the sound service but it's unknown", method); 
   }
@@ -296,17 +307,18 @@
                                                      gboolean blacklist) 
 {
   g_return_val_if_fail (player_name != NULL, FALSE);
+  g_return_val_if_fail (IS_SOUND_SERVICE_DBUS (self), FALSE);
 
+  GVariant* the_black_list;
   gboolean result = FALSE;
-  GSettings* our_settings = NULL;
-  our_settings  = g_settings_new ("com.canonical.indicators.sound");
-  GVariant* the_black_list = g_settings_get_value (our_settings,
-                                                   "blacklisted-media-players");
+  GSettings* our_settings;
   GVariantIter iter;
   gchar *str;
-  // Firstly prep new array which will be set on the key.
   GVariantBuilder builder;
-  
+
+  our_settings  = g_settings_new ("com.canonical.indicators.sound");
+  the_black_list = g_settings_get_value (our_settings,
+                                         "blacklisted-media-players");  
   g_variant_iter_init (&iter, the_black_list);
   g_variant_builder_init(&builder, G_VARIANT_TYPE_STRING_ARRAY);  
 
@@ -373,4 +385,34 @@
   return result;
 }
 
+static gboolean sound_service_dbus_is_blacklisted (SoundServiceDbus *self,
+                                                   gchar            *player_name)
+{
+  GSettings    *our_settings;
+  GVariant     *the_black_list;
+  GVariantIter  iter;
+  gchar        *str;
+  gboolean      result = FALSE;
+
+  g_return_val_if_fail (player_name != NULL, FALSE);
+  g_return_val_if_fail (IS_SOUND_SERVICE_DBUS (self), FALSE);
+
+  our_settings = g_settings_new ("com.canonical.indicators.sound");
+  the_black_list = g_settings_get_value (our_settings,
+                                         "blacklisted-media-players");
+  g_variant_iter_init (&iter, the_black_list);
+  while (g_variant_iter_next (&iter, "s", &str)){
+    if (g_strcmp0 (player_name, str) == 0) {
+      result = TRUE;
+      g_free (str);
+      break;
+    }
+    g_free (str);
+  }
+
+  g_object_unref (our_settings);
+  g_variant_unref (the_black_list);
+
+  return result;
+}
 

=== modified file 'src/sound-service.xml'
--- src/sound-service.xml	2011-01-31 19:14:47 +0000
+++ src/sound-service.xml	2011-03-07 15:28:35 +0000
@@ -7,6 +7,12 @@
         <arg type='b' name='blacklist' direction="in"/>
         <arg type='b' name='result' direction="out"/>
     </method>
+    <method name = "IsBlacklisted">
+        <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
+        <arg type='s' name='player_desktop_name' direction="in"/>
+        <arg type='b' name='result' direction="out"/>
+    </method>
+
     <method name = "GetSoundState">
         <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
         <arg type='i' name='current_state' direction="out"/>