summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlberts Muktupāvels <alberts.muktupavels@gmail.com>2014-12-13 23:37:18 +0200
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>2015-01-21 17:24:35 +0200
commit303ed7394d3608505961ef9a37db0f4bdec96bee (patch)
tree499a4980a7999e330a51cfecf26dd030b9db93ff
parent7d7349e5113dc3c928f5c995f32ef5d20e799387 (diff)
downloadgnome-shell-wip/flashback.tar.gz
ui/shellDBus.js: move ShowOSD to org.gnome.Shell.OSDwip/flashback
-rw-r--r--js/ui/shellDBus.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 85a1e1a98..c450dc1e9 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -22,9 +22,6 @@ const GnomeShellIface = '<node> \
<arg type="s" direction="out" name="result" /> \
</method> \
<method name="FocusSearch"/> \
-<method name="ShowOSD"> \
- <arg type="a{sv}" direction="in" name="params"/> \
-</method> \
<method name="FocusApp"> \
<arg type="s" direction="in" name="id"/> \
</method> \
@@ -57,6 +54,14 @@ const GnomeShellKeyGrabberIface = '<node> \
</interface> \
</node>';
+const GnomeShellOSDIface = '<node> \
+<interface name="org.gnome.Shell.OSD"> \
+<method name="ShowOSD"> \
+ <arg type="a{sv}" direction="in" name="params"/> \
+</method> \
+</interface> \
+</node>';
+
const ScreenSaverIface = '<node> \
<interface name="org.gnome.ScreenSaver"> \
<method name="Lock"> \
@@ -87,6 +92,9 @@ const GnomeShell = new Lang.Class({
this._dbusKeyGrabberImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellKeyGrabberIface, this);
this._dbusKeyGrabberImpl.export(Gio.DBus.session, '/org/gnome/Shell/KeyGrabber');
+ this._dbusOSDImpl = Gio.DBusExportedObject.wrapJSObject(GnomeShellOSDIface, this);
+ this._dbusOSDImpl.export(Gio.DBus.session, '/org/gnome/Shell/OSD');
+
this._extensionsService = new GnomeShellExtensions();
this._screenshotService = new Screenshot.ScreenshotService();