Updated Thai translation.

[evince.git] / shell / ev-media-player-keys.c

diff --git a/shell/ev-media-player-keys.c b/shell/ev-media-player-keys.c
index da334b6cf14ccade8dcaff6eff8ae67ea053a5ec..efc32dcb3c13fe84421a217b337049e94a0aa9f3 100644 (file)
--- a/shell/ev-media-player-keys.c
+++ b/shell/ev-media-player-keys.c
@@ -2,6 +2,7 @@
 /* 
  * Copyright (C) 2007 Jan Arne Petersen <jap@gnome.org>
  * Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
+ * Copyright © 2010 Christian Persch
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,9 +41,8 @@ struct _EvMediaPlayerKeys
 {
        GObject        parent;
 
-        GDBusConnection *connection;
+        GDBusProxy *proxy;
         guint watch_id;
-        guint subscription_id;
 };
 
 struct _EvMediaPlayerKeysClass
@@ -65,6 +65,8 @@ ev_media_player_keys_class_init (EvMediaPlayerKeysClass *klass)
 {
        GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+       object_class->finalize = ev_media_player_keys_finalize;
+
        signals[KEY_PRESSED] =
                g_signal_new ("key_pressed",
                              EV_TYPE_MEDIA_PLAYER_KEYS,
@@ -74,8 +76,6 @@ ev_media_player_keys_class_init (EvMediaPlayerKeysClass *klass)
                              g_cclosure_marshal_VOID__STRING,
                              G_TYPE_NONE,
                              1, G_TYPE_STRING);
-       
-       object_class->finalize = ev_media_player_keys_finalize;
 }
 
 static void
@@ -86,44 +86,37 @@ ev_media_player_keys_grab_keys (EvMediaPlayerKeys *keys)
         * if a media player is there it gets higher priority on the keys (0 is
         * a special value having maximum priority).
         */
-        g_dbus_connection_call (keys->connection,
-                                SD_NAME,
-                                SD_OBJECT_PATH,
-                                SD_INTERFACE,
-                                "GrabMediaPlayerKeys",
-                                g_variant_new ("(su)", "Evince", 1),
-                                G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                -1,
-                                NULL, NULL, NULL);
+        g_dbus_proxy_call (keys->proxy,
+                          "GrabMediaPlayerKeys",
+                          g_variant_new ("(su)", "Evince", 1),
+                          G_DBUS_CALL_FLAGS_NO_AUTO_START,
+                          -1,
+                          NULL, NULL, NULL);
 }
 
 static void
 ev_media_player_keys_release_keys (EvMediaPlayerKeys *keys)
 {
-        g_dbus_connection_call (keys->connection,
-                                SD_NAME,
-                                SD_OBJECT_PATH,
-                                SD_INTERFACE,
-                                "ReleaseMediaPlayerKeys",
-                                g_variant_new ("(s)", "Evince"),
-                                G_DBUS_CALL_FLAGS_NO_AUTO_START,
-                                -1,
-                                NULL, NULL, NULL);
+        g_dbus_proxy_call (keys->proxy,
+                          "ReleaseMediaPlayerKeys",
+                          g_variant_new ("(s)", "Evince"),
+                          G_DBUS_CALL_FLAGS_NO_AUTO_START,
+                          -1,
+                          NULL, NULL, NULL);
 }
 
 static void
-media_player_key_pressed_cb (GDBusConnection *connection,
-                             const gchar *sender_name,
-                             const gchar *object_path,
-                             const gchar *interface_name,
-                             const gchar *signal_name,
-                             GVariant *parameters,
-                             gpointer user_data)
+media_player_key_pressed_cb (GDBusProxy *proxy,
+                            gchar      *sender_name,
+                            gchar      *signal_name,
+                            GVariant   *parameters,
+                            gpointer    user_data)
 {
         const char *application, *key;
 
         if (g_strcmp0 (sender_name, SD_NAME) != 0)
                 return;
+
         if (g_strcmp0 (signal_name, "MediaPlayerKeyPressed") != 0)
                 return;
 
@@ -139,60 +132,53 @@ media_player_key_pressed_cb (GDBusConnection *connection,
 
 static void
 mediakeys_service_appeared_cb (GDBusConnection *connection,
-                               const char      *name,
-                               const char      *name_owner,
-                               gpointer         user_data)
+                              const gchar     *name,
+                              const gchar     *name_owner,
+                              GDBusProxy      *proxy,
+                              gpointer         user_data)
 {
         EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (user_data);
 
-        keys->connection = g_object_ref (connection);
-
-        keys->subscription_id = g_dbus_connection_signal_subscribe (connection,
-                                                                    name_owner,
-                                                                    SD_INTERFACE,
-                                                                    "MediaPlayerKeyPressed",
-                                                                    SD_OBJECT_PATH,
-                                                                    NULL,
-                                                                    media_player_key_pressed_cb,
-                                                                    keys, NULL);
+       keys->proxy = g_object_ref (proxy);
+       g_signal_connect (keys->proxy, "g-signal",
+                         G_CALLBACK (media_player_key_pressed_cb),
+                         keys);
 
        ev_media_player_keys_grab_keys (keys);
 }
 
 static void
 mediakeys_service_disappeared_cb (GDBusConnection *connection,
-                                 const char      *name,
-                                 gpointer         user_data)
+                                 const gchar     *name,
+                                 gpointer         user_data)
 {
         EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (user_data);
 
-        if (keys->connection == NULL)
-                return;
-
-        g_assert (keys->connection == connection);
-
-        g_dbus_connection_signal_unsubscribe (connection, keys->subscription_id);
-        keys->subscription_id = 0;
-
-        g_object_unref (keys->connection);
-        keys->connection = NULL;
+       if (keys->proxy) {
+               g_object_unref (keys->proxy);
+               keys->proxy = NULL;
+       }
 }
 
 static void
 ev_media_player_keys_init (EvMediaPlayerKeys *keys)
 {
-        keys->watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                                           SD_NAME,
-                                           G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                           mediakeys_service_appeared_cb,
-                                           mediakeys_service_disappeared_cb,
-                                           keys, NULL);
+       keys->watch_id = g_bus_watch_proxy (G_BUS_TYPE_SESSION,
+                                           SD_NAME,
+                                           G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                           SD_OBJECT_PATH,
+                                           SD_INTERFACE,
+                                           G_TYPE_DBUS_PROXY,
+                                           G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+                                           mediakeys_service_appeared_cb,
+                                           mediakeys_service_disappeared_cb,
+                                           keys, NULL);
 }
 
 void
 ev_media_player_keys_focused (EvMediaPlayerKeys *keys)
 {
-       if (keys->connection == NULL)
+       if (keys->proxy == NULL)
                return;
        
        ev_media_player_keys_grab_keys (keys);
@@ -203,15 +189,13 @@ ev_media_player_keys_finalize (GObject *object)
 {
        EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (object);
 
-        ev_media_player_keys_release_keys (keys);
-
-        if (keys->subscription_id != 0) {
-                g_assert (keys->connection != NULL);
-                g_dbus_connection_signal_unsubscribe (keys->connection, keys->subscription_id);
-                g_object_unref (keys->connection);
-        }
+       if (keys->watch_id > 0)
+               g_bus_unwatch_proxy (keys->watch_id);
 
-        g_bus_unwatch_name (keys->watch_id);
+        if (keys->proxy != NULL) {
+               ev_media_player_keys_release_keys (keys);
+                g_object_unref (keys->proxy);
+       }
 
        G_OBJECT_CLASS (ev_media_player_keys_parent_class)->finalize (object);
 }