# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1213196429 -10800
# Node ID d239bf252eacd7120337fa5095ad9d479be6c30f
# Parent  8399067f9b1ac785e7d31e55fdc51c3780e8ac0d
Print a warning instead of mysterious dbus-glib assertion failures when
proxy is NULL in mpris_player_init().

diff -r 8399067f9b1a -r d239bf252eac src/audacious/dbus.c
--- a/src/audacious/dbus.c	Wed Jun 11 17:28:03 2008 +0300
+++ b/src/audacious/dbus.c	Wed Jun 11 18:00:29 2008 +0300
@@ -137,14 +137,19 @@
                                         AUDACIOUS_DBUS_PATH_MPRIS_PLAYER,
                                         G_OBJECT(object));
 
-	// Add signals
-	DBusGProxy *proxy = object->proxy;
-	dbus_g_proxy_add_signal(proxy, "StatusChange",
-			G_TYPE_INT, G_TYPE_INVALID);
-	dbus_g_proxy_add_signal(proxy, "CapsChange",
-			G_TYPE_INT, G_TYPE_INVALID);
-	dbus_g_proxy_add_signal(proxy, "TrackChange",
-			DBUS_TYPE_G_STRING_VALUE_HASHTABLE, G_TYPE_INVALID);
+    // Add signals
+    DBusGProxy *proxy = object->proxy;
+    if (proxy != NULL) {
+        dbus_g_proxy_add_signal(proxy, "StatusChange",
+            G_TYPE_INT, G_TYPE_INVALID);
+        dbus_g_proxy_add_signal(proxy, "CapsChange",
+            G_TYPE_INT, G_TYPE_INVALID);
+        dbus_g_proxy_add_signal(proxy, "TrackChange",
+            DBUS_TYPE_G_STRING_VALUE_HASHTABLE, G_TYPE_INVALID);
+    } else {
+        /* XXX / FIXME: Why does this happen? -- ccr */
+        g_warning("in mpris_player_init object->proxy == NULL, not adding some signals.");
+    }
 }
 
 void mpris_tracklist_init(MprisTrackList *object) {