aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac12
-rw-r--r--data/org.ArcticaProject.arctica-greeter.gschema.xml6
-rw-r--r--debian/control3
-rw-r--r--src/menubar.vala2
-rw-r--r--src/settings-daemon.vala4
5 files changed, 13 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac
index a7df2f4..39bd921 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,12 +45,12 @@ if $PKG_CONFIG --exists unity-settings-daemon; then
SD_BINARY="$USD_BINARY"
fi
-elif $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])
+elif $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])
else
- SD_BINARY="$MSD_BINARY"
+ SD_BINARY="$GSD_BINARY"
fi
fi
@@ -58,7 +58,7 @@ fi
if test -z "$SD_BINARY"; then
AC_MSG_ERROR([Could not find any of the supported X11 settings daemons])
else
- AC_DEFINE_UNQUOTED([SD_BINARY], ["$MSD_BINARY"], [Path to m-s-d])
+ AC_DEFINE_UNQUOTED([SD_BINARY], ["$SD_BINARY"], [Path to u-s-d/g-s-d])
fi
dnl ###########################################################################
diff --git a/data/org.ArcticaProject.arctica-greeter.gschema.xml b/data/org.ArcticaProject.arctica-greeter.gschema.xml
index fe91064..1c7d19a 100644
--- a/data/org.ArcticaProject.arctica-greeter.gschema.xml
+++ b/data/org.ArcticaProject.arctica-greeter.gschema.xml
@@ -30,15 +30,15 @@
<summary>Background logo file to use</summary>
</key>
<key name="theme-name" type="s">
- <default>'Ambiance'</default>
+ <default>'Adwaita'</default>
<summary>GTK+ theme to use</summary>
</key>
<key name="icon-theme-name" type="s">
- <default>'ubuntu-mono-dark'</default>
+ <default>'gnome'</default>
<summary>Icon theme to use</summary>
</key>
<key name="font-name" type="s">
- <default>'Ubuntu 11'</default>
+ <default>'Cantarell 11'</default>
<summary>Font to use</summary>
</key>
<key name="xft-antialias" type="b">
diff --git a/debian/control b/debian/control
index 1f5896f..0ae0c57 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,7 @@ Build-Depends: at-spi2-core,
debhelper (>= 9),
dh-autoreconf,
gnome-common,
- humanity-icon-theme,
- unity-settings-daemon-dev | mate-settings-daemon-dev,
+ unity-settings-daemon-dev | gnome-settings-daemon-dev,
libcanberra-dev,
libgnome-desktop-3-dev,
libgtk-3-dev,
diff --git a/src/menubar.vala b/src/menubar.vala
index 303c3d9..886b158 100644
--- a/src/menubar.vala
+++ b/src/menubar.vala
@@ -322,7 +322,7 @@ public class MenuBar : Gtk.MenuBar
greeter_set_env ("GIO_USE_VFS", "local");
greeter_set_env ("GVFS_DISABLE_FUSE", "1");
- /* Hint to have mate-settings-daemon run in greeter mode */
+ /* Hint to have gnome-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 162a032..c5bb4c8 100644
--- a/src/settings-daemon.vala
+++ b/src/settings-daemon.vala
@@ -156,7 +156,7 @@ public class SettingsDaemon : Object
if (n_names != 0)
return;
- debug ("All bus names acquired, starting mate-settings-daemon");
+ debug ("All bus names acquired, starting %s", Config.SD_BINARY);
try
{
@@ -164,7 +164,7 @@ public class SettingsDaemon : Object
}
catch (SpawnError e)
{
- debug ("Could not start mate-settings-daemon: %s", e.message);
+ debug ("Could not start %s: %s", Config.SD_BINARY, e.message);
}
}
}