From f8b878d7815b4e07f44c8f308741dd8db6108767 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Mon, 10 May 2010 16:06:41 +0000
Subject: [shell] Fix for GDBus API changes

---
(limited to 'cut-n-paste')

diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c
index 2e3b362..30ea718 100644
--- a/cut-n-paste/totem-screensaver/totem-scrsaver.c
+++ b/cut-n-paste/totem-screensaver/totem-scrsaver.c
@@ -103,32 +103,32 @@ screensaver_inhibit_dbus (TotemScrsaver *scr,
                 return;
 
 	if (inhibit) {
-                value = g_dbus_connection_invoke_method_sync (scr->priv->connection,
-                                                              GS_SERVICE,
-                                                              GS_PATH,
-                                                              GS_INTERFACE,
-                                                              "Inhibit",
-                                                              g_variant_new ("(ss)",
-                                                                             "Evince",
-                                                                             _("Running in presentation mode")),
-                                                              G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
-                                                              -1,
-                                                              NULL,
-                                                              &error);
+                value = g_dbus_connection_call_sync (scr->priv->connection,
+                                                     GS_SERVICE,
+                                                     GS_PATH,
+                                                     GS_INTERFACE,
+                                                     "Inhibit",
+                                                     g_variant_new ("(ss)",
+                                                                    "Evince",
+                                                                    _("Running in presentation mode")),
+                                                     G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
+                                                     -1,
+                                                     NULL,
+                                                     &error);
 		if (error && g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) {
 			/* try the old API */
                         g_clear_error (&error);
-                        value = g_dbus_connection_invoke_method_sync (scr->priv->connection,
-                                                                      GS_SERVICE,
-                                                                      GS_PATH,
-                                                                      GS_INTERFACE,
-                                                                      "InhibitActivation",
-                                                                      g_variant_new ("(s)",
-                                                                                     _("Running in presentation mode")),
-                                                                      G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
-                                                                      -1,
-                                                                      NULL,
-                                                                      &error);
+                        value = g_dbus_connection_call_sync (scr->priv->connection,
+                                                             GS_SERVICE,
+                                                             GS_PATH,
+                                                             GS_INTERFACE,
+                                                             "InhibitActivation",
+                                                             g_variant_new ("(s)",
+                                                                            _("Running in presentation mode")),
+                                                             G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
+                                                             -1,
+                                                             NULL,
+                                                             &error);
                 }
                 if (value != NULL) {
 			/* save the cookie */
@@ -143,29 +143,29 @@ screensaver_inhibit_dbus (TotemScrsaver *scr,
 		}
 
 	} else {
-                value = g_dbus_connection_invoke_method_sync (scr->priv->connection,
-                                                              GS_SERVICE,
-                                                              GS_PATH,
-                                                              GS_INTERFACE,
-                                                              "UnInhibit",
-                                                              g_variant_new ("(u)", scr->priv->cookie),
-                                                              G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
-                                                              -1,
-                                                              NULL,
-                                                              &error);
+                value = g_dbus_connection_call_sync (scr->priv->connection,
+                                                     GS_SERVICE,
+                                                     GS_PATH,
+                                                     GS_INTERFACE,
+                                                     "UnInhibit",
+                                                     g_variant_new ("(u)", scr->priv->cookie),
+                                                     G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
+                                                     -1,
+                                                     NULL,
+                                                     &error);
 		if (error && g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) {
 			/* try the old API */
                         g_clear_error (&error);
-                        value = g_dbus_connection_invoke_method_sync (scr->priv->connection,
-                                                                      GS_SERVICE,
-                                                                      GS_PATH,
-                                                                      GS_INTERFACE,
-                                                                      "AllowActivation",
-                                                                      g_variant_new ("()"),
-                                                                      G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
-                                                                      -1,
-                                                                      NULL,
-                                                                      &error);
+                        value = g_dbus_connection_call_sync (scr->priv->connection,
+                                                             GS_SERVICE,
+                                                             GS_PATH,
+                                                             GS_INTERFACE,
+                                                             "AllowActivation",
+                                                             g_variant_new ("()"),
+                                                             G_DBUS_INVOKE_METHOD_FLAGS_NO_AUTO_START,
+                                                             -1,
+                                                             NULL,
+                                                             &error);
                 }
                 if (value != NULL) {
 			/* clear the cookie */
--
cgit v0.9.1