[gnome-control-center/wip/garnacho/wayland-tablet: 22/31] wacom: Poke the org.gnome.Shell D-Bus call to show the pad OSD



commit 73d079bbfa89faf2534e9265691d9848f1c18c6e
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Jun 23 16:55:29 2016 +0200

    wacom: Poke the org.gnome.Shell D-Bus call to show the pad OSD
    
    This feature now belongs in gnome-shell, not g-s-d. The D-Bus API
    changed correspondingly.

 panels/wacom/cc-wacom-page.c  |    4 ++--
 panels/wacom/cc-wacom-panel.c |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
index 2ee0487..c830d5b 100644
--- a/panels/wacom/cc-wacom-page.c
+++ b/panels/wacom/cc-wacom-page.c
@@ -462,8 +462,8 @@ set_osd_visibility (CcWacomPage *page)
        }
 
        g_dbus_proxy_call (proxy,
-                          "SetOSDVisibility",
-                          g_variant_new ("(obb)", device_path, TRUE, TRUE),
+                          "Show",
+                          g_variant_new ("(ob)", device_path, TRUE),
                           G_DBUS_CALL_FLAGS_NONE,
                           -1,
                           priv->cancellable,
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index 5df76b0..ab959fb 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -651,9 +651,9 @@ cc_wacom_panel_switch_to_panel (CcWacomPanel *self,
 }
 
 static void
-got_wacom_proxy_cb (GObject      *source_object,
-                   GAsyncResult *res,
-                   gpointer      data)
+got_osd_proxy_cb (GObject      *source_object,
+                 GAsyncResult *res,
+                 gpointer      data)
 {
        GError              *error = NULL;
        CcWacomPanel        *self;
@@ -738,11 +738,11 @@ cc_wacom_panel_init (CcWacomPanel *self)
        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                                  G_DBUS_PROXY_FLAGS_NONE,
                                  NULL,
-                                 "org.gnome.SettingsDaemon.Wacom",
-                                 "/org/gnome/SettingsDaemon/Wacom",
-                                 "org.gnome.SettingsDaemon.Wacom",
+                                 "org.gnome.Shell",
+                                 "/org/gnome/Shell/Wacom",
+                                 "org.gnome.Shell.Wacom.PadOsd",
                                  priv->cancellable,
-                                 got_wacom_proxy_cb,
+                                 got_osd_proxy_cb,
                                  self);
 
        /* Stack + Switcher */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]