[totem] media-player-keys: No warnings when cancelled



commit 7bd422e372bfc74c7d35ef6d543643ec02262aaa
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Apr 7 01:53:25 2011 +0100

    media-player-keys: No warnings when cancelled
    
    We really don't want to warn when grabbing for media player
    keys is cancelled.

 .../media-player-keys/totem-media-player-keys.c    |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/media-player-keys/totem-media-player-keys.c b/src/plugins/media-player-keys/totem-media-player-keys.c
index 29149e7..3c5f507 100644
--- a/src/plugins/media-player-keys/totem-media-player-keys.c
+++ b/src/plugins/media-player-keys/totem-media-player-keys.c
@@ -100,7 +100,8 @@ grab_media_player_keys_cb (GDBusProxy                 *proxy,
 	pi->priv->cancellable = NULL;
 
 	if (variant == NULL) {
-		g_warning ("Failed to call \"GrabMediaPlayerKeys\": %s", error->message);
+		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+			g_warning ("Failed to call \"GrabMediaPlayerKeys\": %s", error->message);
 		g_error_free (error);
 		return;
 	}
@@ -178,7 +179,8 @@ got_proxy_cb (GObject                    *source_object,
 	pi->priv->cancellable_init = NULL;
 
 	if (pi->priv->proxy == NULL) {
-		g_warning ("Failed to contact settings daemon: %s", error->message);
+		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+			g_warning ("Failed to contact settings daemon: %s", error->message);
 		g_error_free (error);
 		return;
 	}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]