[gnome-settings-daemon/wip/flashback: 25/29] wacom: GsdShell -> GsdShellOSD



commit 1cf496810304b83730207363bcbea292145d241a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Dec 14 00:12:07 2014 +0200

    wacom: GsdShell -> GsdShellOSD

 plugins/wacom/gsd-wacom-manager.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index 6d83238..dfc91bc 100644
--- a/plugins/wacom/gsd-wacom-manager.c
+++ b/plugins/wacom/gsd-wacom-manager.c
@@ -116,7 +116,7 @@ struct GsdWacomManagerPrivate
         GnomeRRScreen *rr_screen;
         GHashTable *warned_devices;
 
-        GsdShell *shell_proxy;
+        GsdShellOSD *shell_osd_proxy;
 
         GsdDeviceMapper *device_mapper;
 
@@ -1378,10 +1378,10 @@ notify_osd_for_device (GsdWacomManager *manager,
         if (gdk_screen_get_n_monitors (screen) == 1)
                 return;
 
-        if (manager->priv->shell_proxy == NULL)
-                manager->priv->shell_proxy = gnome_settings_bus_get_shell_proxy ();
+        if (manager->priv->shell_osd_proxy == NULL)
+                manager->priv->shell_osd_proxy = gnome_settings_bus_get_shell_osd_proxy ();
 
-        shell_show_osd (manager->priv->shell_proxy,
+        shell_show_osd (manager->priv->shell_osd_proxy,
                         "input-tablet-symbolic",
                         gsd_wacom_device_get_name (device), -1,
                         monitor_num);
@@ -2010,7 +2010,7 @@ gsd_wacom_manager_finalize (GObject *object)
         if (wacom_manager->priv->start_idle_id != 0)
                 g_source_remove (wacom_manager->priv->start_idle_id);
 
-        g_clear_object (&wacom_manager->priv->shell_proxy);
+        g_clear_object (&wacom_manager->priv->shell_osd_proxy);
 
         G_OBJECT_CLASS (gsd_wacom_manager_parent_class)->finalize (object);
 }


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