Cleanup some leftover GSettings and XfceMenu code

configure.ac

@@ -115,6 +115,14 @@ PKG_CHECK_MODULES(XFCE_SCREENSAVER_COMMAND,
 AC_SUBST(XFCE_SCREENSAVER_COMMAND_CFLAGS)
 AC_SUBST(XFCE_SCREENSAVER_COMMAND_LIBS)
 
+PKG_CHECK_MODULES(XFCE_SCREENSAVER_SAVER,
+        gthread-2.0
+        gtk+-3.0 >= $GTK_REQUIRED_VERSION
+        gobject-2.0 >= $GLIB_REQUIRED_VERSION
+        libxfce4util-1.0 >= LIBXFCE4UTIL_REQUIRED)
+AC_SUBST(XFCE_SCREENSAVER_SAVER_CFLAGS)
+AC_SUBST(XFCE_SCREENSAVER_SAVER_LIBS)
+
 AC_PATH_XTRA
 
 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS"
@@ -122,7 +130,6 @@ SAVER_LIBS="$ALL_X_LIBS"
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
-
 # Solaris requires libresolv for daemon()
 case "$host" in
 	*-*-solaris*)
@@ -130,14 +137,6 @@ case "$host" in
 	;;
 esac
 
-# Optional dependencies for the theme engines
-
-SAVER_MODULES="gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION libxfce4util-1.0 >= LIBXFCE4UTIL_REQUIRED"
-
-PKG_CHECK_MODULES(XFCE_SCREENSAVER_SAVER, $SAVER_MODULES)
-AC_SUBST(XFCE_SCREENSAVER_SAVER_CFLAGS)
-AC_SUBST(XFCE_SCREENSAVER_SAVER_LIBS)
-
 # Find out where the session service file goes
 # The sad sed hack is recomended by section 27.10 of the automake manual.
 DBUS_SESSION_SERVICE_DIR=`pkg-config --variable session_bus_services_dir dbus-1 | sed -e 's,/usr/share,${datarootdir},g'`
@@ -159,14 +158,6 @@ fi
 PAM_PREFIX=`eval echo $PAM_PREFIX_UNEXPANDED`
 AC_SUBST(PAM_PREFIX)
 
-# Desktop entry handling
-
-PKG_CHECK_MODULES(LIB_XFCE_MENU,
-        gtk+-3.0 >= $GTK_REQUIRED_VERSION)
-
-AC_SUBST(LIB_XFCE_MENU_CFLAGS)
-AC_SUBST(LIB_XFCE_MENU_LIBS)
-
 dnl ---------------------------------------------------------------------------
 dnl - Where should we put documentation ?
 dnl ---------------------------------------------------------------------------

data/Makefile.am

@@ -40,7 +40,6 @@ pkgconfig_DATA = xfce4-screensaver.pc
 dbussessionservicedir = $(DBUS_SESSION_SERVICE_DIR)
 dbussessionservice_DATA = org.xfce.ScreenSaver.service
 
-@GSETTINGS_RULES@
 @INTLTOOL_XML_NOMERGE_RULE@
 
 EXTRA_DIST = 				\

src/xfcekbd-indicator.c

@@ -464,12 +464,12 @@ xfcekbd_indicator_reinit_ui (XfcekbdIndicator * gki)
 
 /* Should be called once for all widgets */
 static void
-xfcekbd_indicator_cfg_changed (GSettings *settings,
+xfcekbd_indicator_cfg_changed (XfconfChannel *channel,
 			       gchar     *key,
 			       gpointer   user_data)
 {
 	xkl_debug (100,
-		   "General configuration changed in GSettings - reiniting...\n");
+		   "General configuration changed in Xfconf - reiniting...\n");
 	xfcekbd_desktop_config_load_from_xfconf (&globals.cfg);
 	xfcekbd_desktop_config_activate (&globals.cfg);
 	ForAllIndicators () {
@@ -479,12 +479,12 @@ xfcekbd_indicator_cfg_changed (GSettings *settings,
 
 /* Should be called once for all widgets */
 static void
-xfcekbd_indicator_ind_cfg_changed (GSettings *settings,
+xfcekbd_indicator_ind_cfg_changed (XfconfChannel *channel,
 				   gchar     *key,
 				   gpointer   user_data)
 {
 	xkl_debug (100,
-		   "Applet configuration changed in GSettings - reiniting...\n");
+		   "Applet configuration changed in Xfconf - reiniting...\n");
 	xfcekbd_indicator_config_load_from_xfconf (&globals.ind_cfg);
 	xfcekbd_indicator_update_images ();
 	xfcekbd_indicator_config_activate (&globals.ind_cfg);