[gnome-settings-daemon/wip/muktupavels/flashback: 10/15] common: GsdShell -> GsdShellOSD

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 6c0a12e7cf77e84c36649e6a44852df0f1f0574c
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Dec 14 00:08:09 2014 +0200

    common: GsdShell -> GsdShellOSD

 plugins/common/gsd-shell-helper.c |   10 +++++-----
 plugins/common/gsd-shell-helper.h |    4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/plugins/common/gsd-shell-helper.c b/plugins/common/gsd-shell-helper.c
index 09ed0af..ea52e66 100644
--- a/plugins/common/gsd-shell-helper.c
+++ b/plugins/common/gsd-shell-helper.c
@@ -21,7 +21,7 @@
 #include "gsd-shell-helper.h"
 
 void
-shell_show_osd (GsdShell    *shell,
+shell_show_osd (GsdShellOSD *shell_osd,
                const gchar *icon_name,
                const gchar *label,
                gint         level,
@@ -29,7 +29,7 @@ shell_show_osd (GsdShell    *shell,
 {
        GVariantBuilder builder;
 
-        g_return_if_fail (GSD_IS_SHELL (shell));
+        g_return_if_fail (GSD_IS_SHELL_OSD (shell_osd));
 
         g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
 
@@ -46,7 +46,7 @@ shell_show_osd (GsdShell    *shell,
                 g_variant_builder_add (&builder, "{sv}",
                                        "monitor", g_variant_new_int32 (monitor));
 
-       gsd_shell_call_show_osd (shell,
-                                g_variant_builder_end (&builder),
-                                NULL, NULL, NULL);
+       gsd_shell_osd_call_show_osd (shell_osd,
+                                    g_variant_builder_end (&builder),
+                                    NULL, NULL, NULL);
 }
diff --git a/plugins/common/gsd-shell-helper.h b/plugins/common/gsd-shell-helper.h
index 1ad461e..cc28ff6 100644
--- a/plugins/common/gsd-shell-helper.h
+++ b/plugins/common/gsd-shell-helper.h
@@ -20,11 +20,11 @@
 #ifndef __GSD_SHELL_HELPER_H__
 #define __GSD_SHELL_HELPER_H__
 
-#include "gsd-shell-glue.h"
+#include "gsd-shell-osd-glue.h"
 
 G_BEGIN_DECLS
 
-void shell_show_osd (GsdShell    *shell,
+void shell_show_osd (GsdShellOSD *shell_osd,
                     const gchar *icon_name,
                     const gchar *label,
                     gint         level,