diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2016-06-23 16:55:29 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2016-06-24 19:29:17 +0200 |
| commit | 73d079bbfa89faf2534e9265691d9848f1c18c6e (patch) | |
| tree | ada5abfa75db307ec7d03bdb7e3cfd6b219dd67c | |
| parent | 56d3a9fafac557aafd8dfc17213bd51aac94892d (diff) | |
| download | gnome-control-center-73d079bbfa89faf2534e9265691d9848f1c18c6e.tar.gz | |
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.
| -rw-r--r-- | panels/wacom/cc-wacom-page.c | 4 | ||||
| -rw-r--r-- | 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 2ee048723..c830d5b16 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 5df76b0bc..ab959fb25 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 */ |