gnome-control-center r8395 - in trunk: . capplets/common capplets/keyboard help libwindow-settings po

[rodrigo svn gnome org]

Author: rodrigo
Date: Tue Jan 15 11:45:27 2008
New Revision: 8395
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8395&view=rev

Log:
2008-01-14  Rodrigo Moya <rodrigo gnome-db org>

	* configure.in:
	* NEWS: prepare for 2.21.5.

	* capplets/common/Makefile.am: fixed CFLAGS and LIBS.

	* capplets/common/activate-settings-daemon.c: include new built
	header file for DBus interface.

	* configure.in: check gnome-settings-daemon.

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/capplets/common/Makefile.am
   trunk/capplets/keyboard/ChangeLog
   trunk/capplets/keyboard/Makefile.am
   trunk/configure.in
   trunk/help/ChangeLog
   trunk/libwindow-settings/Makefile.am
   trunk/po/ChangeLog

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Tue Jan 15 11:45:27 2008
@@ -1,3 +1,47 @@
+gnome-control-center 2.21.5
+
+appearance:
+- Read WindowTitleFont and DocumentsFont from meta-theme and use to set
+  the value for /apps/metacity/general/titlebar_font and
+  /desktop/gnome/interface/document_font_name GConf keys (Luca Ferretti)
+  (#504250)
+- Make error dialogs more compliant with the HIG (Thomas Wood) (#400968)
+- Update list model when the background changes (Soren Sandmann)
+
+at-properties:
+- Spawn the a11y tab of the keyboard capplet instead of at-properties.
+
+keyboard:
+- Merge all a11y options into the keyboard capplet (Denis Washington)
+- Move 'type to test settings' entry beneath to make it easily accessible
+  from all tabs (Denis Washington)
+
+mouse:
+- Integrate with mousetweaks (Gerd Kohlberger, Denis Washington) (#503547)
+
+settings daemon:
+- Moved to a separate SVN module (William Jon McCann)
+
+themus/fontilus:
+- Install nautilus extensions in the right spot (Matthias Clasen) (#505364)
+
+updated translations:
+- be latin (Ihar Hrachyshka)
+- es (Jorge Gonzalez)
+- et (Priit Laes)
+- eu (Inaki Larranaga Murgoitio)
+- ga (Sean de Burca)
+- it (Luca Ferretti)
+- nb (Kjartan Maraas)
+- nn (Eskild Hustvedt)
+- oc (Yannig Marchegay)
+- pt (Duarte Loreto)
+- pt_BR (Leonardo Ferreira Fontenelle)
+- sk (Claude Paroz)
+- sv (Daniel Nylander)
+- vi (Clytie Siddall)
+- zh_CN (Funda Wang)
+------------------------------------------------------------------------------
 gnome-control-center 2.21.4
 
 about-me:

Modified: trunk/capplets/common/Makefile.am
==============================================================================
--- trunk/capplets/common/Makefile.am	(original)
+++ trunk/capplets/common/Makefile.am	Tue Jan 15 11:45:27 2008
@@ -8,32 +8,44 @@
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/libbackground					\
 	-I$(top_srcdir)/libwindow-settings				\
-	@DBUS_CFLAGS@							\
-	@VFS_CAPPLET_CFLAGS@						\
-	@GNOME_DESKTOP_CFLAGS@						\
-	@METACITY_CFLAGS@
+	$(DBUS_CFLAGS)							\
+	$(VFS_CAPPLET_CFLAGS)						\
+	$(GNOME_DESKTOP_CFLAGS)						\
+	$(METACITY_CFLAGS)						\
+	$(GSD_DBUS_CFLAGS)
 
 
 noinst_LTLIBRARIES = libcommon.la
 
 libcommon_la_SOURCES = \
-	activate-settings-daemon.c	activate-settings-daemon.h	\
-	capplet-util.c			capplet-util.h			\
-	gconf-property-editor.c		gconf-property-editor.h		\
-	gconf-property-editor-marshal.c	gconf-property-editor-marshal.h \
-	file-transfer-dialog.c		file-transfer-dialog.h		\
-	gnome-theme-info.c		gnome-theme-info.h		\
-	wm-common.c			wm-common.h			\
-	capplet-stock-icons.c		capplet-stock-icons.h		\
-	theme-thumbnail.c		theme-thumbnail.h		\
-	gnome-theme-apply.c		gnome-theme-apply.h \
-	gtkrc-utils.c		gtkrc-utils.h
+	activate-settings-daemon.c	\
+	activate-settings-daemon.h	\
+	capplet-stock-icons.c		\
+	capplet-stock-icons.h		\
+	capplet-util.c			\
+	capplet-util.h			\
+	file-transfer-dialog.c		\
+	file-transfer-dialog.h		\
+	gconf-property-editor.c		\
+	gconf-property-editor.h		\
+	gconf-property-editor-marshal.c	\
+	gconf-property-editor-marshal.h \
+	gnome-theme-apply.c		\
+	gnome-theme-apply.h 		\
+	gnome-theme-info.c		\
+	gnome-theme-info.h		\
+	gtkrc-utils.c			\
+	gtkrc-utils.h			\
+	theme-thumbnail.c		\
+	theme-thumbnail.h		\
+	wm-common.c			\
+	wm-common.h
 
 libcommon_la_LIBADD = $(top_builddir)/libbackground/libbackground.la	\
 	$(top_builddir)/libwindow-settings/libgnome-window-settings.la  \
-	@METACITY_LIBS@							\
-	@DBUS_LIBS@							\
-	@GNOME_DESKTOP_LIBS@
+	$(METACITY_LIBS)							\
+	$(DBUS_LIBS)							\
+	$(GNOME_DESKTOP_LIBS)
 
 gnome_theme_test_SOURCES = \
 	gnome-theme-test.c
@@ -43,4 +55,4 @@
 	$(GNOMECC_CAPPLETS_LIBS)
 
 noinst_PROGRAMS = \
-	gnome-theme-test
+	gnome-theme-test
\ No newline at end of file

Modified: trunk/capplets/keyboard/Makefile.am
==============================================================================
--- trunk/capplets/keyboard/Makefile.am	(original)
+++ trunk/capplets/keyboard/Makefile.am	Tue Jan 15 11:45:27 2008
@@ -3,15 +3,17 @@
 
 bin_PROGRAMS = gnome-keyboard-properties
 
-gnome_keyboard_properties_SOURCES = gnome-keyboard-properties.c \
-                                    gnome-keyboard-properties-a11y.c \
-                                    gnome-keyboard-properties-xkb.c \
-                                    gnome-keyboard-properties-xkbmc.c \
-                                    gnome-keyboard-properties-xkblt.c \
-                                    gnome-keyboard-properties-xkbltadd.c \
-                                    gnome-keyboard-properties-xkbot.c \
-                                    gnome-keyboard-properties-xkbpv.c \
-                                    gnome-keyboard-properties-xkb.h
+gnome_keyboard_properties_SOURCES = \
+	gnome-keyboard-properties.c \
+	gnome-keyboard-properties-a11y.c \
+	gnome-keyboard-properties-a11y.h \
+	gnome-keyboard-properties-xkb.c \
+	gnome-keyboard-properties-xkbmc.c \
+	gnome-keyboard-properties-xkblt.c \
+	gnome-keyboard-properties-xkbltadd.c \
+	gnome-keyboard-properties-xkbot.c \
+	gnome-keyboard-properties-xkbpv.c \
+	gnome-keyboard-properties-xkb.h
 
 gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS)
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jan 15 11:45:27 2008
@@ -110,6 +110,7 @@
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
 PKG_CHECK_MODULES(METACITY, libmetacity-private)
 PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-2.0)
+PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
 
 dnl
 dnl Check for Xft version 2; we build in extra functionality to the font capplet
@@ -508,8 +509,6 @@
 capplets/keybindings/keybinding.desktop.in
 capplets/keyboard/Makefile
 capplets/keyboard/keyboard.desktop.in
-capplets/localization/Makefile
-capplets/localization/localization.desktop.in
 capplets/mouse/Makefile
 capplets/mouse/gnome-settings-mouse.desktop.in
 capplets/network/Makefile
@@ -518,10 +517,6 @@
 capplets/sound/gnome-settings-sound.desktop.in
 capplets/windows/Makefile
 capplets/windows/window-properties.desktop.in
-gnome-settings-daemon/Makefile
-gnome-settings-daemon/actions/Makefile
-gnome-settings-daemon/gnome-settings-daemon.pc
-gnome-settings-daemon/xrdb/Makefile
 help/Makefile
 libbackground/Makefile
 libslab/Makefile

Modified: trunk/libwindow-settings/Makefile.am
==============================================================================
--- trunk/libwindow-settings/Makefile.am	(original)
+++ trunk/libwindow-settings/Makefile.am	Tue Jan 15 11:45:27 2008
@@ -37,7 +37,7 @@
 	gnome-window-settings-2.0.pc.in		\
 	ChangeLog
 
-wms_flags = -export_dynamic -avoid-version -module -no-undefined
+wms_flags = -export_dynamic -avoid-version -module
 wmsdir = $(WM_MODULE_DIR)
 
 wms_LTLIBRARIES =			\