From a4ab3569cc1ae80ca5a89e5a52b0efe1dddfffee Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 29 Apr 2017 21:30:15 +0000 Subject: Switch to using MATE's Settings Daemon. --- autogen.sh | 6 +++--- configure.ac | 10 +++++----- debian/control | 9 +++++---- src/arctica-greeter.vala | 6 +++--- src/idle-monitor.vala | 4 ++-- src/menubar.vala | 2 +- src/settings-daemon.vala | 44 ++++++++++++++++++++++---------------------- 7 files changed, 41 insertions(+), 40 deletions(-) diff --git a/autogen.sh b/autogen.sh index e8188e5..8ea6dda 100755 --- a/autogen.sh +++ b/autogen.sh @@ -14,8 +14,8 @@ REQUIRED_AUTOMAKE_VERSION=1.7 exit 1 } -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" +which mate-autogen || { + echo "You need to install mate-common from the MATE Desktop Environment" exit 1 } -USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh +USE_COMMON_DOC_BUILD=yes . mate-autogen diff --git a/configure.ac b/configure.ac index 685177f..805ce94 100644 --- a/configure.ac +++ b/configure.ac @@ -38,12 +38,12 @@ AC_DEFINE_UNQUOTED([INDICATOR_FILE_DIR], ["${prefix}/share/ayatana/indicators"], INDICATORDIR=`$PKG_CONFIG --variable=indicatordir ayatana-indicator3-0.4` AC_SUBST(INDICATORDIR) -if $PKG_CONFIG --exists gnome-settings-daemon; then - GSD_BINARY=`$PKG_CONFIG --variable=binary gnome-settings-daemon` - if test -z "$GSD_BINARY"; then - AC_MSG_NOTICE([Could not find path to gnome-settings-daemon binary]) +if $PKG_CONFIG --exists mate-settings-daemon; then + MSD_BINARY=`$PKG_CONFIG --variable=binary mate-settings-daemon` + if test -z "$MSD_BINARY"; then + AC_MSG_NOTICE([Could not find path to mate-settings-daemon binary]) else - SD_BINARY="$GSD_BINARY" + SD_BINARY="$MSD_BINARY" fi fi diff --git a/debian/control b/debian/control index 0d39942..e369235 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Build-Depends: at-spi2-core, debhelper (>= 9), dh-autoreconf, fonts-droid-fallback | fonts-droid, - gnome-common, - gnome-settings-daemon-dev, + mate-common, + mate-settings-daemon-dev, libayatana-ido3-0.4-dev (>= 0.4.0~), libayatana-indicator3-dev (>= 0.6.0~), libcanberra-dev, @@ -34,7 +34,8 @@ Depends: ${misc:Depends}, fonts-cabin, lightdm, network-manager, - gnome-settings-daemon, + mate-settings-daemon, + systemd, Recommends: indicator-application, indicator-datetime, indicator-keyboard, @@ -45,7 +46,7 @@ Recommends: indicator-application, lightdm-remote-session-freerdp, lightdm-remote-session-x2go, remote-logon-service, - gnome-settings-daemon, + mate-settings-daemon, xinput, Provides: lightdm-greeter Breaks: 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 watches; - private GenericSet alarms; + private GenericSet 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 (null, null); - alarms = new GenericSet (null, null); + alarms = new GenericSet (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); -- cgit v1.2.3