totem r5025 - in trunk: . src/plugins/media-player-keys

[fcrozat svn gnome org]

Author: fcrozat
Date: Wed Jan 16 19:03:13 2008
New Revision: 5025
URL: http://svn.gnome.org/viewvc/totem?rev=5025&view=rev

Log:
2008-01-16  Frederic Crozat  <fcrozat mandriva com>

        * src/plugins/media-player-keys/totem-media-player-keys.c:
        Do not popup error only if gnome-settings-daemon was not
        running (Really closes #509438).



Modified:
   trunk/ChangeLog
   trunk/src/plugins/media-player-keys/totem-media-player-keys.c

Modified: trunk/src/plugins/media-player-keys/totem-media-player-keys.c
==============================================================================
--- trunk/src/plugins/media-player-keys/totem-media-player-keys.c	(original)
+++ trunk/src/plugins/media-player-keys/totem-media-player-keys.c	Wed Jan 16 19:03:13 2008
@@ -148,10 +148,14 @@
 			"org.gnome.SettingsDaemon", &err);
 	dbus_g_connection_unref (connection);
 	if (err != NULL) {
+		gboolean daemon_not_running;
 		g_warning ("Failed to create dbus proxy for org.gnome.SettingsDaemon: %s",
-				   err->message);
+			   err->message);
+		daemon_not_running = (err->code == DBUS_GERROR_NAME_HAS_NO_OWNER);
 		g_error_free (err);
-		return FALSE;
+		/* don't popup error if settings-daemon is not running,
+ 		 * ie when starting totem not under GNOME desktop */
+		return daemon_not_running;
 	} else {
 		g_signal_connect_object (pi->media_player_keys_proxy,
 					 "destroy",