[shell] Update to current GDBus API

[evince.git] / shell / ev-application.c

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 0f29da88e23b7915298294245cb45ca5c7039d31..98167d2843ecb40a9de9caa1b4a2c059d527496d 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -1,6 +1,7 @@
 /* this file is part of evince, a gnome document viewer
  *
  *  Copyright (C) 2004 Martin Kretzschmar
+ *  Copyright © 2010 Christian Persch
  *
  *  Author:
  *    Martin Kretzschmar <martink@gnome.org>
@@ -373,6 +374,7 @@ ev_application_register_uri (EvApplication *application,
                     "org.gnome.evince.Daemon",
                     "RegisterDocument",
                     g_variant_new ("(s)", uri),
+                   G_VARIANT_TYPE ("(s)"),
                     G_DBUS_CALL_FLAGS_NONE,
                     -1,
                     NULL,
@@ -430,6 +432,7 @@ ev_application_register_uri (EvApplication *application,
                      APPLICATION_DBUS_INTERFACE,
                      "OpenURI",
                      g_variant_builder_end (&builder),
+                    NULL,
                      G_DBUS_CALL_FLAGS_NONE,
                      -1,
                      NULL,
@@ -465,6 +468,7 @@ ev_application_unregister_uri (EvApplication *application,
                     "org.gnome.evince.Daemon",
                     "UnregisterDocument",
                     g_variant_new ("(s)", uri),
+                   NULL,
                     G_DBUS_CALL_FLAGS_NO_AUTO_START,
                     -1,
                     NULL,
@@ -841,8 +845,6 @@ ev_application_init (EvApplication *ev_application)
 
        ev_application_accel_map_load (ev_application);
 
-       ev_application->scr_saver = totem_scrsaver_new ();
-
 #ifdef ENABLE_DBUS
 {
         static const char introspection_xml[] =
@@ -873,7 +875,6 @@ ev_application_init (EvApplication *ev_application)
                 ev_application->registration_id =
                     g_dbus_connection_register_object (ev_application->connection,
                                                        APPLICATION_DBUS_OBJECT_PATH,
-                                                       APPLICATION_DBUS_INTERFACE,
                                                        introspection_data->interfaces[0],
                                                        &interface_vtable,
                                                        ev_application, NULL,
@@ -889,7 +890,11 @@ ev_application_init (EvApplication *ev_application)
         }
 
        ev_application->keys = ev_media_player_keys_new ();
+
+       ev_application->scr_saver = totem_scrsaver_new ();
 }
+#else
+        ev_application->scr_saver = totem_scrsaver_new ();
 #endif /* ENABLE_DBUS */
 }