Remove various E4X junk remove4x can't handle

This commit is contained in:
Jasper St. Pierre 2013-09-11 14:38:16 -04:00
parent 2d8ed4c77f
commit db1c65970b
3 changed files with 4 additions and 7 deletions

View File

@ -20,7 +20,7 @@ const ObjectManagerIface = <interface name="org.freedesktop.DBus.ObjectManager">
<arg name="objectPath" type="o"/> <arg name="objectPath" type="o"/>
<arg name="interfaces" type="as" /> <arg name="interfaces" type="as" />
</signal> </signal>
</interface> </interface>;
const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface); const ObjectManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ObjectManagerIface);

View File

@ -4,14 +4,12 @@ const Gio = imports.gi.Gio;
const Lang = imports.lang; const Lang = imports.lang;
const Main = imports.ui.main; const Main = imports.ui.main;
const MAG_SERVICE_NAME = 'org.gnome.Magnifier';
const MAG_SERVICE_PATH = '/org/gnome/Magnifier'; const MAG_SERVICE_PATH = '/org/gnome/Magnifier';
const ZOOM_SERVICE_NAME = 'org.gnome.Magnifier.ZoomRegion';
const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion'; const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion';
// Subset of gnome-mag's Magnifier dbus interface -- to be expanded. See: // Subset of gnome-mag's Magnifier dbus interface -- to be expanded. See:
// http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml
const MagnifierIface = <interface name={MAG_SERVICE_NAME}> const MagnifierIface = <interface name="org.gnome.Magnifier">
<method name="setActive"> <method name="setActive">
<arg type="b" direction="in" /> <arg type="b" direction="in" />
</method> </method>
@ -66,7 +64,7 @@ const MagnifierIface = <interface name={MAG_SERVICE_NAME}>
// Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded. See: // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded. See:
// http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml
const ZoomRegionIface = <interface name={ZOOM_SERVICE_NAME}> const ZoomRegionIface = <interface name="org.gnome.Magnifier.ZoomRegion">
<method name="setMagFactor"> <method name="setMagFactor">
<arg type="d" direction="in" /> <arg type="d" direction="in" />
<arg type="d" direction="in" /> <arg type="d" direction="in" />

View File

@ -41,8 +41,7 @@ const MAX_INPUT_SOURCE_ACTIVATION_TIME = 4000; // ms
const BUS_NAME = 'org.gnome.SettingsDaemon.Keyboard'; const BUS_NAME = 'org.gnome.SettingsDaemon.Keyboard';
const OBJECT_PATH = '/org/gnome/SettingsDaemon/Keyboard'; const OBJECT_PATH = '/org/gnome/SettingsDaemon/Keyboard';
const KeyboardManagerInterface = const KeyboardManagerInterface = <interface name="org.gnome.SettingsDaemon.Keyboard">
<interface name="org.gnome.SettingsDaemon.Keyboard">
<method name="SetInputSource"> <method name="SetInputSource">
<arg type="u" direction="in" /> <arg type="u" direction="in" />
</method> </method>