gnome-settings-daemon r92 - in trunk: . plugins/a11y-keyboard plugins/background plugins/clipboard plugins/default-editor plugins/dummy plugins/font plugins/keybindings plugins/keyboard plugins/media-keys plugins/media-keys/actions plugins/mouse plugins/screensaver plugins/sound plugins/typing-break plugins/xrandr plugins/xrdb plugins/xsettings src

From: chpe svn gnome org
To: svn-commits-list gnome org
Subject: gnome-settings-daemon r92 - in trunk: . plugins/a11y-keyboard plugins/background plugins/clipboard plugins/default-editor plugins/dummy plugins/font plugins/keybindings plugins/keyboard plugins/media-keys plugins/media-keys/actions plugins/mouse plugins/screensaver plugins/sound plugins/typing-break plugins/xrandr plugins/xrdb plugins/xsettings src
Date: Fri, 1 Feb 2008 18:27:12 +0000 (GMT)
Author: chpe
Date: Fri Feb  1 18:27:11 2008
New Revision: 92
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=92&view=rev

Log:
2008-02-01  Christian Persch  <chpe gnome org>

	Bug #513246.

	* acinclude.m4:
	* configure.ac:
	* plugins/a11y-keyboard/Makefile.am:
	* plugins/background/Makefile.am:
	* plugins/clipboard/Makefile.am:
	* plugins/default-editor/Makefile.am:
	* plugins/dummy/Makefile.am:
	* plugins/font/Makefile.am:
	* plugins/keybindings/Makefile.am:
	* plugins/keyboard/Makefile.am:
	* plugins/media-keys/Makefile.am:
	* plugins/media-keys/actions/Makefile.am:
	* plugins/mouse/Makefile.am:
	* plugins/screensaver/Makefile.am:
	* plugins/sound/Makefile.am:
	* plugins/typing-break/Makefile.am:
	* plugins/xrandr/Makefile.am:
	* plugins/xrdb/Makefile.am:
	* plugins/xsettings/Makefile.am: Use a flat directory instead of a
	directory hierarchy to install the plugins into.
	Install data files under $(pkgdatadir), not under $(libdir).

	* src/Makefile.am:
	* src/gnome-settings-plugins-engine.c:
	(gnome_settings_plugin_info_free),
	(gnome_settings_plugins_engine_load),
	(gnome_settings_plugins_engine_load_file),
	(gnome_settings_plugins_engine_load_dir): Don't scan the plugins
	directory recursively. Use GSlice for the plugin info struct.

Modified:
   trunk/ChangeLog
   trunk/acinclude.m4
   trunk/configure.ac
   trunk/plugins/a11y-keyboard/Makefile.am
   trunk/plugins/background/Makefile.am
   trunk/plugins/clipboard/Makefile.am
   trunk/plugins/default-editor/Makefile.am
   trunk/plugins/dummy/Makefile.am
   trunk/plugins/font/Makefile.am
   trunk/plugins/keybindings/Makefile.am
   trunk/plugins/keyboard/Makefile.am
   trunk/plugins/media-keys/Makefile.am
   trunk/plugins/media-keys/actions/Makefile.am
   trunk/plugins/mouse/Makefile.am
   trunk/plugins/screensaver/Makefile.am
   trunk/plugins/sound/Makefile.am
   trunk/plugins/typing-break/Makefile.am
   trunk/plugins/xrandr/Makefile.am
   trunk/plugins/xrdb/Makefile.am
   trunk/plugins/xsettings/Makefile.am
   trunk/src/Makefile.am
   trunk/src/gnome-settings-plugins-engine.c

Modified: trunk/acinclude.m4
==============================================================================
--- trunk/acinclude.m4	(original)
+++ trunk/acinclude.m4	Fri Feb  1 18:27:11 2008
@@ -1,47 +1,3 @@
-dnl as-ac-expand.m4 0.2.0
-dnl autostars m4 macro for expanding directories using configure's prefix
-dnl thomas apestaart org
-
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl example
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
-AC_DEFUN([AS_AC_EXPAND],
-[
-  EXP_VAR=[$1]
-  FROM_VAR=[$2]
-
-  dnl first expand prefix and exec_prefix if necessary
-  prefix_save=$prefix
-  exec_prefix_save=$exec_prefix
-
-  dnl if no prefix given, then use /usr/local, the default prefix
-  if test "x$prefix" = "xNONE"; then
-    prefix="$ac_default_prefix"
-  fi
-  dnl if no exec_prefix given, then use prefix
-  if test "x$exec_prefix" = "xNONE"; then
-    exec_prefix=$prefix
-  fi
-
-  full_var="$FROM_VAR"
-  dnl loop until it doesn't change anymore
-  while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var" = "x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-  dnl clean up
-  full_var=$new_full_var
-  AC_SUBST([$1], "$full_var")
-
-  dnl restore prefix and exec_prefix
-  prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-])
-
 dnl EXTRA_COMPILE_WARNINGS
 dnl Turn on many useful compiler warnings
 dnl For now, only works on GCC

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb  1 18:27:11 2008
@@ -68,8 +68,8 @@
 
 PKG_CHECK_MODULES(GNOME, libgnome-2.0 libgnomeui-2.0)
 
-PLUGIN_LIBTOOL_FLAGS="-export_dynamic -module -avoid-version"
-AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
+GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
+AC_SUBST([GSD_PLUGIN_LDFLAGS])
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_XTRA
@@ -283,16 +283,13 @@
 else
   AC_MSG_NOTICE([*** Sound capplet will not be built]);
 fi
+ 
+# ---------------------------------------------------------------------------
+# Plugins
+# ---------------------------------------------------------------------------
 
-dnl ---------------------------------------------------------------------------
-dnl - Expand vars
-dnl ---------------------------------------------------------------------------
-
-AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
-AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-AS_AC_EXPAND(DATADIR, $datadir)
-AS_AC_EXPAND(LIBDIR, $libdir)
-AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
+plugindir='$(pkglibdir)/plugins'
+AC_SUBST([plugindir])
 
 dnl ---------------------------------------------------------------------------
 dnl - Finish
@@ -403,6 +400,7 @@
         sysconfdir:               ${sysconfdir}
         sysconfsubdir:            ${sysconfsubdir}
         localstatedir:            ${localstatedir}
+        plugindir:                ${plugindir}
         datadir:                  ${datadir}
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}

Modified: trunk/plugins/a11y-keyboard/Makefile.am
==============================================================================
--- trunk/plugins/a11y-keyboard/Makefile.am	(original)
+++ trunk/plugins/a11y-keyboard/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,16 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/a11y-keyboard
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(GNOME_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	liba11y-keyboard.la		\
 	$(NULL)
@@ -22,9 +11,18 @@
 	gsd-a11y-keyboard-manager.c	\
 	$(NULL)
 
+liba11y_keyboard_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+liba11y_keyboard_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(GNOME_CFLAGS)			\
+	$(AM_CFLAGS)
+
 liba11y_keyboard_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)		\
-	$(modules_flags)		\
+	$(GSD_PLUGIN_LDFLAGS)		\
 	$(NULL)
 
 liba11y_keyboard_la_LIBADD  = 		\
@@ -33,9 +31,6 @@
 	$(GNOME_LIBS)			\
 	$(NULL)
 
-liba11y_keyboard_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	a11y-keyboard.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/background/Makefile.am
==============================================================================
--- trunk/plugins/background/Makefile.am	(original)
+++ trunk/plugins/background/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -4,17 +4,6 @@
 	libbackground	\
 	$(NULL)
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/background
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/plugins/background/libbackground	\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
-	$(SETTINGS_PLUGIN_CFLAGS)				\
-	$(NULL)
-
 noinst_PROGRAMS = 			\
 	test-background			\
 	$(NULL)
@@ -25,9 +14,19 @@
 	gsd-background-manager.c	\
 	$(NULL)
 
+test_background_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/plugins/background/libbackground   \
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+test_background_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 test_background_LDADD =		\
+	$(top_builddir)/plugins/background/libbackground/libbackground.la \
 	$(SETTINGS_PLUGIN_LIBS)	\
-	$(top_builddir)/plugins/background/libbackground/libbackground.la		\
 	$(NULL)
 
 plugin_LTLIBRARIES = \
@@ -41,17 +40,23 @@
 	gsd-background-manager.c	\
 	$(NULL)
 
+libbackground_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-I$(top_srcdir)/plugins/background/libbackground   \
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libbackground_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libbackground_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libbackground_la_LIBADD  = 		\
+	$(top_builddir)/plugins/background/libbackground/libbackground.la \
 	$(SETTINGS_PLUGIN_LIBS)		\
-	$(top_builddir)/plugins/background/libbackground/libbackground.la		\
-	$(NULL)
-
-libbackground_la_CFLAGS = 		\
 	$(NULL)
 
 plugin_in_files = 		\

Modified: trunk/plugins/clipboard/Makefile.am
==============================================================================
--- trunk/plugins/clipboard/Makefile.am	(original)
+++ trunk/plugins/clipboard/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,15 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/clipboard
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libclipboard.la		\
 	$(NULL)
@@ -25,18 +15,23 @@
 	list.c			\
 	$(NULL)
 
+libclipboard_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libclipboard_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libclipboard_la_LDFLAGS = 	\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libclipboard_la_LIBADD  = 	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libclipboard_la_CFLAGS = 	\
-	$(NULL)
-
 plugin_in_files = 		\
 	clipboard.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/default-editor/Makefile.am
==============================================================================
--- trunk/plugins/default-editor/Makefile.am	(original)
+++ trunk/plugins/default-editor/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,15 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/default-editor
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libdefault-editor.la		\
 	$(NULL)
@@ -21,18 +11,23 @@
 	gsd-default-editor-manager.c	\
 	$(NULL)
 
+libdefault_editor_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libdefault_editor_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libdefault_editor_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libdefault_editor_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libdefault_editor_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	default-editor.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/dummy/Makefile.am
==============================================================================
--- trunk/plugins/dummy/Makefile.am	(original)
+++ trunk/plugins/dummy/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,15 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/dummy
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libdummy.la		\
 	$(NULL)
@@ -21,18 +11,23 @@
 	gsd-dummy-manager.c	\
 	$(NULL)
 
+libdummy_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libdummy_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libdummy_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libdummy_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libdummy_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	dummy.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/font/Makefile.am
==============================================================================
--- trunk/plugins/font/Makefile.am	(original)
+++ trunk/plugins/font/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,15 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/font
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libfont.la		\
 	$(NULL)
@@ -23,18 +13,23 @@
 	delayed-dialog.c	\
 	$(NULL)
 
+libfont_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libfont_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libfont_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libfont_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libfont_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	font.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/keybindings/Makefile.am
==============================================================================
--- trunk/plugins/keybindings/Makefile.am	(original)
+++ trunk/plugins/keybindings/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,15 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/keybindings
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libkeybindings.la		\
 	$(NULL)
@@ -23,18 +13,23 @@
 	eggaccelerators.c		\
 	$(NULL)
 
+libkeybindings_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libkeybindings_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libkeybindings_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libkeybindings_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libkeybindings_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	keybindings.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/keyboard/Makefile.am
==============================================================================
--- trunk/plugins/keyboard/Makefile.am	(original)
+++ trunk/plugins/keyboard/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,22 +1,10 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/keyboard
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	-DDATADIR=\""$(plugindir)"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(LIBGNOMEKBD_CFLAGS)				\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libkeyboard.la		\
 	$(NULL)
 
-Gladedir   = $(plugindir)
+Gladedir   = $(pkgdatadir)
 Glade_DATA = modmap-dialog.glade
 
 libkeyboard_la_SOURCES = 	\
@@ -32,9 +20,19 @@
 	delayed-dialog.c	\
 	$(NULL)
 
+libkeyboard_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DDATADIR=\""$(pkgdatadir)"\"	\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libkeyboard_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(LIBGNOMEKBD_CFLAGS)		\
+	$(AM_CFLAGS)
+
 libkeyboard_la_LDFLAGS = 	\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libkeyboard_la_LIBADD  = 	\
@@ -43,9 +41,6 @@
 	$(LIBGNOMEKBD_LIBS)	\
 	$(NULL)
 
-libkeyboard_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	keyboard.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/media-keys/Makefile.am
==============================================================================
--- trunk/plugins/media-keys/Makefile.am	(original)
+++ trunk/plugins/media-keys/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -4,19 +4,6 @@
 	actions		\
 	$(NULL)
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/media-keys
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-I$(top_builddir)/plugins/media-keys/actions	\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	-DPIXMAPDIR=\""$(plugindir)"\"			\
-	-DGLADEDIR=\""$(plugindir)"\"			\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libmedia-keys.la		\
 	$(NULL)
@@ -50,19 +37,27 @@
 	$(BUILT_SOURCES)		\
 	$(NULL)
 
+libmedia_keys_la_CPPFLAGS = \
+	-I$(top_srcdir)/src					\
+	-I$(top_builddir)/plugins/media-keys/actions		\
+	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
+	-DGLADEDIR=\""$(pkgdatadir)"\"				\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
+	$(AM_CPPFLAGS)
+
+libmedia_keys_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libmedia_keys_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)		\
-	$(modules_flags)		\
+	$(GSD_PLUGIN_LDFLAGS)		\
 	$(NULL)
 
 libmedia_keys_la_LIBADD  = 		\
+	$(top_builddir)/plugins/media-keys/actions/libacme.la	\
 	$(SETTINGS_PLUGIN_LIBS)		\
 	$(XF86MISC_LIBS)		\
 	$(GST_LIBS)			\
-	$(top_builddir)/plugins/media-keys/actions/libacme.la	\
-	$(NULL)
-
-libmedia_keys_la_CFLAGS = 		\
 	$(NULL)
 
 plugin_in_files = 		\
@@ -81,6 +76,18 @@
 	test-media-window.c			\
 	$(NULL)
 
+test_media_window_CPPFLAGS = \
+	-I$(top_srcdir)/src					\
+	-I$(top_builddir)/plugins/media-keys/actions		\
+	-DPIXMAPDIR=\""$(pkgdatadir)"\"				\
+	-DGLADEDIR=\""$(pkgdatadir)"\"				\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
+	$(AM_CPPFLAGS)
+
+test_media_window_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 test_media_window_LDADD = \
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\

Modified: trunk/plugins/media-keys/actions/Makefile.am
==============================================================================
--- trunk/plugins/media-keys/actions/Makefile.am	(original)
+++ trunk/plugins/media-keys/actions/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,10 +1,5 @@
 NULL =
 
-INCLUDES = 				\
-	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(GST_CFLAGS)			\
-	$(NULL)
-
 noinst_LTLIBRARIES = libacme.la
 
 libacme_la_SOURCES = 		\
@@ -15,44 +10,63 @@
 	acme-volume-dummy.h	\
 	$(NULL)
 
+libacme_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libacme_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(GST_CFLAGS)			\
+	$(AM_CFLAGS)
+
 libacme_la_LIBADD =		\
 	$(NULL)
 
-GST_SOURCES = acme-volume-gstreamer.c acme-volume-gstreamer.h
-ALSA_SOURCES = acme-volume-alsa.c acme-volume-alsa.h
-OSS_SOURCES = acme-volume-oss.c acme-volume-oss.h
-
 if HAVE_GSTREAMER
-INCLUDES += -DHAVE_GSTREAMER
-libacme_la_SOURCES += $(GST_SOURCES)
+libacme_la_SOURCES += \
+	acme-volume-gstreamer.c \
+	acme-volume-gstreamer.h \
+	$(NULL)
+
+libacme_la_CPPFLAGS += -DHAVE_GSTREAMER
+
 libacme_la_LIBADD += $(GST_LIBS)
+
 else # HAVE_GSTREAMER
+
 if HAVE_ALSA
-INCLUDES += -DHAVE_ALSA
-libacme_la_SOURCES += $(ALSA_SOURCES)
+libacme_la_SOURCES += \
+	acme-volume-alsa.c \
+	acme-volume-alsa.h \
+	$(NULL)
+
+libacme_la_CPPFLAGS += -DHAVE_ALSA
+
 libacme_la_LIBADD += $(ALSA_LIBS)
+
 else # HAVE_ALSA
+
 if HAVE_OSS
-INCLUDES += -DHAVE_OSS
+libacme_la_SOURCES += \
+	acme-volume-oss.c \
+	acme-volume-oss.h \
+	$(NULL)
+
+libacme_la_CPPFLAGS += -DHAVE_OSS
+
 libacme_la_SOURCES += $(OSS_SOURCES)
+
 endif # HAVE_OSS
 endif # HAVE_ALSA
 endif # HAVE_GSTREAMER
 
-EXTRA_libacme_la_SOURCES = 	\
-	$(GST_SOURCES)		\
-	$(ALSA_SOURCES)		\
-	$(OSS_SOURCES)		\
-	$(NULL)
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/media-keys
-
-gladedir = $(plugindir)
+gladedir = $(pkgdatadir)
 glade_DATA = 		\
 	acme.glade	\
 	$(NULL)
 
-pixmapsdir = $(plugindir)
+pixmapsdir = $(pkgdatadir)
 pixmaps_DATA = 		\
 	acme-eject.png	\
 	$(NULL)

Modified: trunk/plugins/mouse/Makefile.am
==============================================================================
--- trunk/plugins/mouse/Makefile.am	(original)
+++ trunk/plugins/mouse/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,15 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/mouse
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libmouse.la		\
 	$(NULL)
@@ -25,18 +15,23 @@
 	gsd-timeline.c		\
 	$(NULL)
 
+libmouse_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libmouse_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libmouse_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libmouse_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libmouse_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	mouse.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/screensaver/Makefile.am
==============================================================================
--- trunk/plugins/screensaver/Makefile.am	(original)
+++ trunk/plugins/screensaver/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,15 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/screensaver
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libscreensaver.la		\
 	$(NULL)
@@ -21,18 +11,23 @@
 	gsd-screensaver-manager.c	\
 	$(NULL)
 
+libscreensaver_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libscreensaver_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libscreensaver_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libscreensaver_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libscreensaver_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	screensaver.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/sound/Makefile.am
==============================================================================
--- trunk/plugins/sound/Makefile.am	(original)
+++ trunk/plugins/sound/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -4,18 +4,6 @@
 	libsounds	\
 	$(NULL)
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/sound
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-I$(top_srcdir)/plugins/sounds/libsounds	\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(GNOME_CFLAGS)					\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libsound.la		\
 	$(NULL)
@@ -27,9 +15,19 @@
 	gsd-sound-manager.c	\
 	$(NULL)
 
+libsound_la_CPPFLAGS = \
+	-I$(top_srcdir)/src					\
+	-I$(top_srcdir)/plugins/sounds/libsounds		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
+	$(AM_CPPFLAGS)
+
+libsound_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(GNOME_CFLAGS)			\
+	$(AM_CFLAGS)
+
 libsound_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libsound_la_LIBADD  = 		\
@@ -37,9 +35,6 @@
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libsound_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	sound.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/typing-break/Makefile.am
==============================================================================
--- trunk/plugins/typing-break/Makefile.am	(original)
+++ trunk/plugins/typing-break/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,15 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/typing-break
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libtyping-break.la		\
 	$(NULL)
@@ -21,18 +11,23 @@
 	gsd-typing-break-manager.c	\
 	$(NULL)
 
+libtyping_break_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libtyping_break_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libtyping_break_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libtyping_break_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libtyping_break_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	typing-break.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/xrandr/Makefile.am
==============================================================================
--- trunk/plugins/xrandr/Makefile.am	(original)
+++ trunk/plugins/xrandr/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,15 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/xrandr
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libxrandr.la		\
 	$(NULL)
@@ -21,18 +11,23 @@
 	gsd-xrandr-manager.c	\
 	$(NULL)
 
+libxrandr_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libxrandr_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libxrandr_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libxrandr_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libxrandr_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	xrandr.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/xrdb/Makefile.am
==============================================================================
--- trunk/plugins/xrdb/Makefile.am	(original)
+++ trunk/plugins/xrdb/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -4,17 +4,6 @@
 	data		\
 	$(NULL)
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/xrdb
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
-	-DDATADIR=\""$(datadir)/gnome-settings-daemon"\"	\
-	$(SETTINGS_PLUGIN_CFLAGS)				\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libxrdb.la		\
 	$(NULL)
@@ -26,18 +15,24 @@
 	gsd-xrdb-manager.c	\
 	$(NULL)
 
+libxrdb_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DDATADIR=\""$(pkgdatadir)"\"	\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libxrdb_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libxrdb_la_LDFLAGS = 		\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libxrdb_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libxrdb_la_CFLAGS = 		\
-	$(NULL)
-
 plugin_in_files = 		\
 	xrdb.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/plugins/xsettings/Makefile.am
==============================================================================
--- trunk/plugins/xsettings/Makefile.am	(original)
+++ trunk/plugins/xsettings/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -1,15 +1,5 @@
 NULL =
 
-modules_flags = -export_dynamic -avoid-version -module -no-undefined
-
-plugindir = $(libdir)/gnome-settings-daemon/plugins/xsettings
-
-INCLUDES = \
-	-I$(top_srcdir)/src		\
-	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"\
-	$(SETTINGS_PLUGIN_CFLAGS)			\
-	$(NULL)
-
 plugin_LTLIBRARIES = \
 	libxsettings.la		\
 	$(NULL)
@@ -25,18 +15,23 @@
 	xsettings-manager.c	\
 	$(NULL)
 
+libxsettings_la_CPPFLAGS = \
+	-I$(top_srcdir)/src		\
+	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libxsettings_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(AM_CFLAGS)
+
 libxsettings_la_LDFLAGS = 	\
-	$(PLUGIN_LIBTOOL_FLAGS)	\
-	$(modules_flags)	\
+	$(GSD_PLUGIN_LDFLAGS)	\
 	$(NULL)
 
 libxsettings_la_LIBADD  = 	\
 	$(SETTINGS_PLUGIN_LIBS)	\
 	$(NULL)
 
-libxsettings_la_CFLAGS = 	\
-	$(NULL)
-
 plugin_in_files = 		\
 	xsettings.gnome-settings-plugin.in	\
 	$(NULL)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Feb  1 18:27:11 2008
@@ -4,7 +4,7 @@
 	-DDATADIR=\""$(datadir)"\"				\
 	-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"	\
 	-DLIBEXECDIR=\""$(libexecdir)"\" 			\
-	-DGNOME_SETTINGS_PLUGINDIR=\""$(libdir)/gnome-settings-daemon/plugins"\" \
+	-DGNOME_SETTINGS_PLUGINDIR=\""$(plugindir)"\"		\
 	$(WARN_CFLAGS)						\
 	$(DISABLE_DEPRECATED_CFLAGS)				\
 	$(SETTINGS_DAEMON_CFLAGS)				\

Modified: trunk/src/gnome-settings-plugins-engine.c
==============================================================================
--- trunk/src/gnome-settings-plugins-engine.c	(original)
+++ trunk/src/gnome-settings-plugins-engine.c	Fri Feb  1 18:27:11 2008
@@ -92,7 +92,7 @@
         g_free (info->copyright);
         g_strfreev (info->authors);
 
-        g_free (info);
+        g_slice_free (GnomeSettingsPluginInfo, info);
 }
 
 static GnomeSettingsPluginInfo *
@@ -106,7 +106,7 @@
 
         g_debug ("Loading plugin: %s", file);
 
-        info = g_new0 (GnomeSettingsPluginInfo, 1);
+        info = g_slice_new0 (GnomeSettingsPluginInfo);
         info->file = g_strdup (file);
 
         plugin_file = g_key_file_new ();
@@ -197,7 +197,8 @@
         g_free (info->file);
         g_free (info->location);
         g_free (info->name);
-        g_free (info);
+        g_slice_free (GnomeSettingsPluginInfo, info);
+
         g_key_file_free (plugin_file);
 
         return NULL;
@@ -223,10 +224,6 @@
         char                  *key_name;
         gboolean               activate;
 
-        if (g_str_has_suffix (filename, PLUGIN_EXT) == FALSE) {
-                return;
-        }
-
         info = gnome_settings_plugins_engine_load (filename);
         if (info == NULL) {
                 return;
@@ -288,14 +285,14 @@
         while ((name = g_dir_read_name (d))) {
                 char *filename;
 
+                if (!g_str_has_suffix (name, PLUGIN_EXT))
+                        continue;
+
                 filename = g_build_filename (path, name, NULL);
-                if (g_file_test (filename, G_FILE_TEST_IS_DIR) != FALSE) {
-                        gnome_settings_plugins_engine_load_dir (filename);
-                } else {
+                if (g_file_test (filename, G_FILE_TEST_IS_REGULAR)) {
                         gnome_settings_plugins_engine_load_file (filename);
                 }
                 g_free (filename);
-
         }
 
         g_dir_close (d);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]