Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorChristian Persch <chpe@gnome.org>2010-05-10 16:06:41 (GMT)
committer Carlos Garcia Campos <carlosgc@gnome.org>2010-05-25 07:38:30 (GMT)
commitf8b878d7815b4e07f44c8f308741dd8db6108767 (patch)
tree6577be252820451421f98a5bc67a887c7641eb1e /shell
parentf330181c78fd7b1e9cae7575ed2df0c7ce0c9fb5 (diff)
[shell] Fix for GDBus API changes
Diffstat (limited to 'shell')
-rw-r--r--shell/ev-application.c12
-rw-r--r--shell/ev-media-player-keys.c36
2 files changed, 24 insertions, 24 deletions
diff --git a/shell/ev-application.c b/shell/ev-application.c
index 4331496..0f29da8 100644
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -366,14 +366,14 @@ ev_application_register_uri (EvApplication *application,
return TRUE;
/* FIXME: Don't make sync dbus calls, they block the UI! */
- value = g_dbus_connection_invoke_method_sync
+ value = g_dbus_connection_call_sync
(application->connection,
"org.gnome.evince.Daemon",
"/org/gnome/evince/Daemon",
"org.gnome.evince.Daemon",
"RegisterDocument",
g_variant_new ("(s)", uri),
- G_DBUS_INVOKE_METHOD_FLAGS_NONE,
+ G_DBUS_CALL_FLAGS_NONE,
-1,
NULL,
&error);
@@ -423,14 +423,14 @@ ev_application_register_uri (EvApplication *application,
g_variant_builder_add (&builder, "u", timestamp);
- value2 = g_dbus_connection_invoke_method_sync
+ value2 = g_dbus_connection_call_sync
(application->connection,
owner,
APPLICATION_DBUS_OBJECT_PATH,
APPLICATION_DBUS_INTERFACE,
"OpenURI",
g_variant_builder_end (&builder),
- G_DBUS_INVOKE_METHOD_FLAGS_NONE,
+ G_DBUS_CALL_FLAGS_NONE,
-1,
NULL,
&error);
@@ -458,14 +458,14 @@ ev_application_unregister_uri (EvApplication *application,
return;
/* FIXME: Don't make sync dbus calls, they block the UI! */
- value = g_dbus_connection_invoke_method_sync
+ value = g_dbus_connection_call_sync
(application->connection,
"org.gnome.evince.Daemon",
"/org/gnome/evince/Daemon",
"org.gnome.evince.Daemon",
"UnregisterDocument",
g_variant_new ("(s)", uri),
- G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
+ G_DBUS_CALL_FLAGS_NO_AUTO_START,
-1,
NULL,
&error);
diff --git a/shell/ev-media-player-keys.c b/shell/ev-media-player-keys.c
index ac364bb..b848906 100644
--- a/shell/ev-media-player-keys.c
+++ b/shell/ev-media-player-keys.c
@@ -86,29 +86,29 @@ 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_invoke_method (keys->connection,
- SD_NAME,
- SD_OBJECT_PATH,
- SD_INTERFACE,
- "GrabMediaPlayerKeys",
- g_variant_new ("(su)", "Evince", 1),
- G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
- -1,
- NULL, NULL, NULL);
+ 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);
}
static void
ev_media_player_keys_release_keys (EvMediaPlayerKeys *keys)
{
- g_dbus_connection_invoke_method (keys->connection,
- SD_NAME,
- SD_OBJECT_PATH,
- SD_INTERFACE,
- "ReleaseMediaPlayerKeys",
- g_variant_new ("(s)", "Evince"),
- G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
- -1,
- NULL, NULL, NULL);
+ 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);
}
static void