/*
* 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
#define SD_OBJECT_PATH "/org/gnome/SettingsDaemon/MediaKeys"
#define SD_INTERFACE "org.gnome.SettingsDaemon.MediaKeys"
-enum {
- PROP_0,
- PROP_CONNECTION
-};
-
enum {
KEY_PRESSED,
LAST_SIGNAL
{
GObject parent;
- GDBusConnection *connection;
- guint watch_id;
- guint subscription_id;
+ GDBusProxy *proxy;
+ gboolean has_name_owner;
};
struct _EvMediaPlayerKeysClass
G_DEFINE_TYPE (EvMediaPlayerKeys, ev_media_player_keys, G_TYPE_OBJECT)
-static void ev_media_player_keys_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void ev_media_player_keys_constructed (GObject *object);
static void ev_media_player_keys_finalize (GObject *object);
static void
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->set_property = ev_media_player_keys_set_property;
- object_class->constructed = ev_media_player_keys_constructed;
object_class->finalize = ev_media_player_keys_finalize;
signals[KEY_PRESSED] =
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE,
1, G_TYPE_STRING);
+}
+
+static void
+ev_media_player_keys_update_has_name_owner (EvMediaPlayerKeys *keys)
+{
+ gchar *name_owner;
+
+ if (!keys->proxy) {
+ keys->has_name_owner = FALSE;
+ return;
+ }
- g_object_class_install_property (object_class,
- PROP_CONNECTION,
- g_param_spec_object ("connection", NULL, NULL,
- G_TYPE_DBUS_CONNECTION,
- G_PARAM_WRITABLE |
- G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_STRINGS));
+ name_owner = g_dbus_proxy_get_name_owner (keys->proxy);
+ keys->has_name_owner = (name_owner != NULL);
+ g_free (name_owner);
}
static void
ev_media_player_keys_grab_keys (EvMediaPlayerKeys *keys)
{
+ if (!keys->has_name_owner)
+ return;
+
/*
* The uint as second argument is time. We give a very low value so that
* 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);
+ if (!keys->has_name_owner)
+ return;
+
+ 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;
}
static void
-mediakeys_service_appeared_cb (GDBusConnection *connection,
- const char *name,
- const char *name_owner,
- gpointer user_data)
+mediakeys_name_owner_changed (GObject *object,
+ GParamSpec *pspec,
+ gpointer user_data)
{
- EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (user_data);
-
- g_assert (connection == keys->connection);
-
- keys->subscription_id = g_dbus_connection_signal_subscribe (keys->connection,
- name_owner,
- SD_INTERFACE,
- "MediaPlayerKeyPressed",
- SD_OBJECT_PATH,
- NULL,
- media_player_key_pressed_cb,
- keys, NULL);
+ EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (user_data);
- ev_media_player_keys_grab_keys (keys);
+ ev_media_player_keys_update_has_name_owner (keys);
}
static void
-mediakeys_service_disappeared_cb (GDBusConnection *connection,
- const char *name,
- gpointer user_data)
+mediakeys_service_appeared_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
{
EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (user_data);
+ GDBusProxy *proxy;
- g_assert (connection == keys->connection);
+ proxy = g_dbus_proxy_new_for_bus_finish (res, NULL);
- if (keys->subscription_id != 0) {
- g_dbus_connection_signal_unsubscribe (connection, keys->subscription_id);
- keys->subscription_id = 0;
- }
-}
+ if (proxy == NULL) {
+ return;
+ }
-static void
-ev_media_player_keys_init (EvMediaPlayerKeys *keys)
-{
+ g_signal_connect (proxy, "g-signal",
+ G_CALLBACK (media_player_key_pressed_cb),
+ keys);
+ g_signal_connect (proxy, "notify::g-name-owner",
+ G_CALLBACK (mediakeys_name_owner_changed),
+ keys);
+
+ keys->proxy = proxy;
+ ev_media_player_keys_update_has_name_owner (keys);
+ ev_media_player_keys_grab_keys (keys);
}
static void
-ev_media_player_keys_constructed (GObject *object)
+ev_media_player_keys_init (EvMediaPlayerKeys *keys)
{
- EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (object);
-
- keys->watch_id = g_bus_watch_name_on_connection (keys->connection,
- SD_NAME,
- G_BUS_NAME_WATCHER_FLAGS_NONE,
- mediakeys_service_appeared_cb,
- mediakeys_service_disappeared_cb,
- keys, NULL);
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ NULL,
+ SD_NAME,
+ SD_OBJECT_PATH,
+ SD_INTERFACE,
+ NULL,
+ mediakeys_service_appeared_cb,
+ keys);
}
void
ev_media_player_keys_focused (EvMediaPlayerKeys *keys)
{
- if (keys->connection == NULL)
+ if (keys->proxy == NULL)
return;
ev_media_player_keys_grab_keys (keys);
{
EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (object);
- ev_media_player_keys_release_keys (keys);
-
- g_bus_unwatch_name (keys->watch_id);
-
- if (keys->subscription_id != 0) {
- g_dbus_connection_signal_unsubscribe (keys->connection, keys->subscription_id);
- }
-
- if (keys->connection != NULL) {
- g_object_unref (keys->connection);
- }
+ if (keys->proxy != NULL) {
+ ev_media_player_keys_release_keys (keys);
+ g_object_unref (keys->proxy);
+ keys->proxy = NULL;
+ keys->has_name_owner = FALSE;
+ }
G_OBJECT_CLASS (ev_media_player_keys_parent_class)->finalize (object);
}
-static void
-ev_media_player_keys_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (object);
-
- switch (prop_id) {
- case PROP_CONNECTION:
- keys->connection = g_value_dup_object (value);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
-}
-
EvMediaPlayerKeys *
-ev_media_player_keys_new (GDBusConnection *connection)
+ev_media_player_keys_new (void)
{
- return g_object_new (EV_TYPE_MEDIA_PLAYER_KEYS,
- "connection", connection,
- NULL);
+ return g_object_new (EV_TYPE_MEDIA_PLAYER_KEYS, NULL);
}
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff