From: Carlos Garcia Campos Date: Tue, 25 May 2010 08:04:12 +0000 (+0200) Subject: [shell] Update to current GDBus API X-Git-Tag: EVINCE_2_31_2~10 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=4da16e0c0882f8eec36c06aeeb86fe0116fbd025;p=evince.git [shell] Update to current GDBus API And bump glib requirements --- diff --git a/configure.ac b/configure.ac index 8c508c87..b66d4a7c 100644 --- a/configure.ac +++ b/configure.ac @@ -123,7 +123,7 @@ AM_CONDITIONAL([PLATFORM_WIN32],[test "$with_platform" = "win32"]) dnl Specify required versions of dependencies GTK_REQUIRED=2.21.0 -GLIB_REQUIRED=2.25.6 +GLIB_REQUIRED=2.25.7 KEYRING_REQUIRED=2.22.0 AC_SUBST([GLIB_REQUIRED]) AC_SUBST([GTK_REQUIRED]) diff --git a/shell/ev-application.c b/shell/ev-application.c index 071af79e..98167d28 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -374,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, @@ -431,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, @@ -466,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,