diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-29 21:30:15 +0000 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-04-29 21:30:15 +0000 |
| commit | a4ab3569cc1ae80ca5a89e5a52b0efe1dddfffee (patch) | |
| tree | f557575ee82d1bcbd2d43c2390f4f68b7c7462fa /src | |
| parent | d70a6935b286ede3d188c50adf755e2fabec747c (diff) | |
| download | arctica-greeter-a4ab3569cc1ae80ca5a89e5a52b0efe1dddfffee.tar.gz arctica-greeter-a4ab3569cc1ae80ca5a89e5a52b0efe1dddfffee.tar.bz2 arctica-greeter-a4ab3569cc1ae80ca5a89e5a52b0efe1dddfffee.zip | |
Switch to using MATE's Settings Daemon.
Diffstat (limited to 'src')
| -rw-r--r-- | src/arctica-greeter.vala | 6 | ||||
| -rw-r--r-- | src/idle-monitor.vala | 4 | ||||
| -rw-r--r-- | src/menubar.vala | 2 | ||||
| -rw-r--r-- | src/settings-daemon.vala | 44 |
4 files changed, 28 insertions, 28 deletions
diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala index 1a500e6..ca4faa9 100644 --- a/src/arctica-greeter.vala +++ b/src/arctica-greeter.vala @@ -110,12 +110,12 @@ public class ArcticaGreeter /* Render things after xsettings is ready */ xsettings_ready.connect ( xsettings_ready_cb ); - GLib.Bus.watch_name (BusType.SESSION, "org.gnome.SettingsDaemon", BusNameWatcherFlags.NONE, + GLib.Bus.watch_name (BusType.SESSION, "org.mate.SettingsDaemon", BusNameWatcherFlags.NONE, (c, name, owner) => { try { settings_daemon_proxy = GLib.Bus.get_proxy_sync ( - BusType.SESSION, "org.gnome.SettingsDaemon", "/org/gnome/SettingsDaemon"); + BusType.SESSION, "org.mate.SettingsDaemon", "/org/mate/SettingsDaemon"); settings_daemon_proxy.plugin_activated.connect ( (name) => { @@ -752,7 +752,7 @@ public class DialogDBusInterface : Object } } -[DBus (name="org.gnome.SettingsDaemon")] +[DBus (name="org.mate.SettingsDaemon")] private interface SettingsDaemonDBusInterface : Object { public signal void plugin_activated (string name); diff --git a/src/idle-monitor.vala b/src/idle-monitor.vala index 2713223..2068330 100644 --- a/src/idle-monitor.vala +++ b/src/idle-monitor.vala @@ -4,7 +4,7 @@ public class IdleMonitor { private unowned X.Display display; private HashTable<uint, IdleMonitorWatch> watches; - private GenericSet<uint32, uint32> alarms; + private GenericSet<uint32> alarms; private int sync_event_base; private X.ID counter; private X.ID user_active_alarm; @@ -13,7 +13,7 @@ public class IdleMonitor public IdleMonitor () { watches = new HashTable<uint, IdleMonitorWatch> (null, null); - alarms = new GenericSet<uint32, uint32> (null, null); + alarms = new GenericSet<uint32> (null, null); init_xsync (); } diff --git a/src/menubar.vala b/src/menubar.vala index c55f31c..9735a38 100644 --- a/src/menubar.vala +++ b/src/menubar.vala @@ -319,7 +319,7 @@ public class MenuBar : Gtk.MenuBar greeter_set_env ("GIO_USE_VFS", "local"); greeter_set_env ("GVFS_DISABLE_FUSE", "1"); - /* Hint to have gnome-settings-daemon run in greeter mode */ + /* Hint to have mate-settings-daemon run in greeter mode */ greeter_set_env ("RUNNING_UNDER_GDM", "1"); /* Let indicators know about our unique dbus name */ diff --git a/src/settings-daemon.vala b/src/settings-daemon.vala index c5bb4c8..cedd288 100644 --- a/src/settings-daemon.vala +++ b/src/settings-daemon.vala @@ -26,28 +26,28 @@ public class SettingsDaemon : Object public void start () { - string[] disabled = { "org.gnome.settings-daemon.plugins.background", - "org.gnome.settings-daemon.plugins.clipboard", - "org.gnome.settings-daemon.plugins.font", - "org.gnome.settings-daemon.plugins.gconf", - "org.gnome.settings-daemon.plugins.gsdwacom", - "org.gnome.settings-daemon.plugins.housekeeping", - "org.gnome.settings-daemon.plugins.keybindings", - "org.gnome.settings-daemon.plugins.keyboard", - "org.gnome.settings-daemon.plugins.media-keys", - "org.gnome.settings-daemon.plugins.mouse", - "org.gnome.settings-daemon.plugins.print-notifications", - "org.gnome.settings-daemon.plugins.smartcard", - "org.gnome.settings-daemon.plugins.sound", - "org.gnome.settings-daemon.plugins.wacom" }; - - string[] enabled = { "org.gnome.settings-daemon.plugins.a11y-keyboard", - "org.gnome.settings-daemon.plugins.a11y-settings", - "org.gnome.settings-daemon.plugins.color", - "org.gnome.settings-daemon.plugins.cursor", - "org.gnome.settings-daemon.plugins.power", - "org.gnome.settings-daemon.plugins.xrandr", - "org.gnome.settings-daemon.plugins.xsettings" }; + string[] disabled = { "org.mate.settings-daemon.plugins.background", + "org.mate.settings-daemon.plugins.clipboard", + "org.mate.settings-daemon.plugins.font", + "org.mate.settings-daemon.plugins.gconf", + "org.mate.settings-daemon.plugins.gsdwacom", + "org.mate.settings-daemon.plugins.housekeeping", + "org.mate.settings-daemon.plugins.keybindings", + "org.mate.settings-daemon.plugins.keyboard", + "org.mate.settings-daemon.plugins.media-keys", + "org.mate.settings-daemon.plugins.mouse", + "org.mate.settings-daemon.plugins.print-notifications", + "org.mate.settings-daemon.plugins.smartcard", + "org.mate.settings-daemon.plugins.sound", + "org.mate.settings-daemon.plugins.wacom" }; + + string[] enabled = { "org.mate.settings-daemon.plugins.a11y-keyboard", + "org.mate.settings-daemon.plugins.a11y-settings", + "org.mate.settings-daemon.plugins.color", + "org.mate.settings-daemon.plugins.cursor", + "org.mate.settings-daemon.plugins.power", + "org.mate.settings-daemon.plugins.xrandr", + "org.mate.settings-daemon.plugins.xsettings" }; foreach (var schema in disabled) set_plugin_enabled (schema, false); |