[Xfce4-commits] [panel-plugins/xfce4-pulseaudio-plugin] 01/01: Handle buggy DBUS responses from Pithos

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-pulseaudio-plugin.

commit 2c520e6a57bfdfe5f999855b593ca4fc496fd3b0
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Nov 29 19:40:33 2017 -0500

    Handle buggy DBUS responses from Pithos
---
 panel-plugin/pulseaudio-mpris-player.c | 36 ++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/panel-plugin/pulseaudio-mpris-player.c b/panel-plugin/pulseaudio-mpris-player.c
index da4d7ef..304bb75 100644
--- a/panel-plugin/pulseaudio-mpris-player.c
+++ b/panel-plugin/pulseaudio-mpris-player.c
@@ -455,11 +455,17 @@ pulseaudio_mpris_player_on_dbus_property_signal (GDBusProxy *proxy,
   g_variant_iter_init (&iter, parameters);
 
   child = g_variant_iter_next_value (&iter); /* Interface name. */
-  g_variant_unref (child);
+  if (child)
+    {
+      g_variant_unref (child);
+    }
 
   child = g_variant_iter_next_value (&iter); /* Property name. */
-  pulseaudio_mpris_player_parse_player_properties (player, child);
-  g_variant_unref (child);
+  if (child)
+    {
+      pulseaudio_mpris_player_parse_player_properties (player, child);
+      g_variant_unref(child);
+    }
 }
 
 
@@ -481,24 +487,30 @@ pulseaudio_mpris_player_on_dbus_connected (GDBusConnection *connection,
 
   /* And informs the current status of the player */
   reply = pulseaudio_mpris_player_get_all_player_properties (player);
-  pulseaudio_mpris_player_parse_player_properties (player, reply);
-
   if (reply)
-    g_variant_unref (reply);
+    {
+      pulseaudio_mpris_player_parse_player_properties (player, reply);
+      g_variant_unref (reply);
+    }
+
 
   /* Media player properties */
   reply = pulseaudio_mpris_player_get_all_media_player_properties (player);
-  pulseaudio_mpris_player_parse_media_player_properties (player, reply);
-
   if (reply)
-    g_variant_unref (reply);
+    {
+      pulseaudio_mpris_player_parse_media_player_properties (player, reply);
+      g_variant_unref (reply);
+    }
+
 
   /* Playlists */
   reply = pulseaudio_mpris_player_playlists_get_playlists (player);
-  pulseaudio_mpris_player_parse_playlists (player, reply);
-
   if (reply)
-    g_variant_unref(reply);
+  {
+    pulseaudio_mpris_player_parse_playlists (player, reply);
+    g_variant_unref (reply);
+  }
+
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.