Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

9 files changed, 157 insertions, 51 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index a740f6b..5af7294 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,25 +6,29 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.2.2
+PORTVERSION=	2.4.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.2
+MASTER_SITE_SUBDIR=	sources/control-center/2.4
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Control center for GNOME 2.0 project
+COMMENT=	Control center for GNOME 2 project
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop metacity
-USE_LIBTOOL=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier metacity nautilus2
+GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 348a7f9..6602899 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (gnome2/control-center-2.2.2.tar.bz2) = d5288d0e4249a5afdef494d5c59cb1bc
+MD5 (gnome2/control-center-2.4.0.tar.bz2) = 44115d3174d2f603f34a336ada562bae
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 1f63c8a..83ef887 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,13 +1,5 @@
 --- configure.orig	Wed Dec 18 16:10:09 2002
 +++ configure	Sun Dec 22 16:36:03 2002
-@@ -8516,6 +8516,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -12607,7 +12608,7 @@
  
  
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
deleted file mode 100644
index 49e8125..0000000
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnome-settings-daemon/Makefile.in.orig	Fri Jan 17 12:30:39 2003
-+++ gnome-settings-daemon/Makefile.in	Fri Jan 17 12:33:06 2003
-@@ -195,7 +195,7 @@
- 	$(GNOME_SETTINGS_DAEMON_LIBS)					\
- 	$(top_builddir)/libbackground/libbackground.la			\
- 	$(top_builddir)/libsounds/libsounds.a				\
--	-L$(top_builddir)/libwindow-settings/ -lgnome-window-settings 	\
-+	-L$(top_builddir)/libwindow-settings/.libs -lgnome-window-settings 	\
- 	$(XF86MISC_LIBS)
- 
- 
diff --git a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in b/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
deleted file mode 100644
index d8ece4b..0000000
--- a/sysutils/gnome-control-center/files/patch-libbackground_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libbackground/Makefile.in.orig	Fri Jan 17 12:33:42 2003
-+++ libbackground/Makefile.in	Fri Jan 17 12:34:13 2003
-@@ -151,7 +151,7 @@
- 
- INCLUDES = \
-         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
--	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
-+	-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"			\
- 	-DG_LOG_DOMAIN=\"capplet-common\"				\
- 	-I$(top_srcdir)/						\
- 	@CAPPLET_CFLAGS@
diff --git a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in b/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
deleted file mode 100644
index c4d9211..0000000
--- a/sysutils/gnome-control-center/files/patch-libwindow-settings_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libwindow-settings/Makefile.in.orig	Fri Jan 17 12:34:44 2003
-+++ libwindow-settings/Makefile.in	Fri Jan 17 12:35:43 2003
-@@ -151,7 +151,7 @@
- 
- INCLUDES = \
-         -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 		\
--	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
-+	-DGNOME_ICONDIR=\""${datadir}/pixmaps"\"			\
- 	-DG_LOG_DOMAIN=\"capplet-common\"				\
- 	-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \
- 	-I$(top_srcdir)/						\
diff --git a/sysutils/gnome-control-center/files/patch-ltmain.sh b/sysutils/gnome-control-center/files/patch-ltmain.sh
new file mode 100644
index 0000000..49efbb5
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Thu May  1 11:30:14 2003
++++ ltmain.sh	Mon Aug 11 14:38:46 2003
+@@ -1280,7 +1280,7 @@
+ 	  esac
+ 	elif test "X$arg" = "X-lc_r"; then
+ 	 case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	   # Do not include libc_r directly, use -pthread flag.
+ 	   continue
+ 	   ;;
+@@ -1290,8 +1290,16 @@
+ 	continue
+ 	;;
+ 
++      -pthread)
++      compile_command="$compile_command -pthread"
++      finalize_command="$finalize_command -pthread"
++      compiler_flags="$compiler_flags -pthread"
++      continue
++      ;;
++
+       -module)
+ 	module=yes
++	build_old_libs=no
+ 	continue
+ 	;;
+ 
+@@ -3000,6 +3008,9 @@
+ 	    # problems, so we reset it completely
+ 	    verstring=
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5428,10 +5439,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c
new file mode 100644
index 0000000..a9add20
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-vfs_methods_themus_theme-method.c
@@ -0,0 +1,10 @@
+--- vfs-methods/themus/theme-method.c.orig	Fri Jun 13 07:52:44 2003
++++ vfs-methods/themus/theme-method.c	Sat Jun 28 12:50:39 2003
+@@ -19,6 +19,7 @@
+ 
+ #include <string.h>
+ #include <errno.h>
++#include <libintl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index bddf090..00cba32 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,42 +1,76 @@
 bin/gnome-accessibility-keyboard-properties
+bin/gnome-at-properties
 bin/gnome-background-properties
 bin/gnome-control-center
 bin/gnome-default-applications-properties
+bin/gnome-display-properties
 bin/gnome-file-types-properties
 bin/gnome-font-properties
+bin/gnome-font-viewer
 bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-settings-daemon
 bin/gnome-sound-properties
+bin/themus-theme-applier
 bin/gnome-theme-manager
+bin/gnome-theme-thumbnailer
+bin/gnome-thumbnail-font
+bin/gnome-typing-monitor
 bin/gnome-ui-properties
 bin/gnome-window-properties
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
 etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 etc/gconf/schemas/desktop_gnome_font_rendering.schemas
+etc/gconf/schemas/fontilus.schemas
+etc/gconf/schemas/themus.schemas
+etc/gnome-vfs-2.0/modules/font-method.conf
+etc/gnome-vfs-2.0/modules/theme-method.conf
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
+lib/bonobo/libthemus-theme-properties-view.so
+lib/gnome-vfs-2.0/modules/libfont-method.so
+lib/gnome-vfs-2.0/modules/libtheme-method.so
 lib/libgnome-window-settings.a
 lib/libgnome-window-settings.so
 lib/libgnome-window-settings.so.1
+lib/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.so
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
+libdata/bonobo/servers/Themus_Properties_View.server
+libdata/bonobo/servers/fontilus.server
 libdata/pkgconfig/gnome-window-settings-2.0.pc
+libexec/fontilus-context-menu
+share/gnome/application-registry/fontilus.applications
+share/gnome/application-registry/themus.applications
 share/gnome/applications/gnomecc.desktop
 share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
+share/gnome/control-center-2.0/capplets/at-properties.desktop
 share/gnome/control-center-2.0/capplets/background.desktop
 share/gnome/control-center-2.0/capplets/behavior.desktop
 share/gnome/control-center-2.0/capplets/default-applications.desktop
+share/gnome/control-center-2.0/capplets/display-properties.desktop
 share/gnome/control-center-2.0/capplets/file-types.desktop
 share/gnome/control-center-2.0/capplets/font-properties.desktop
 share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
@@ -48,13 +82,17 @@ share/gnome/control-center-2.0/capplets/sound.desktop
 share/gnome/control-center-2.0/capplets/window-properties.desktop
 share/gnome/control-center-2.0/icons/accessibility-directory.png
 share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png
+share/gnome/control-center-2.0/icons/at-enable-capplet.png
 share/gnome/control-center-2.0/icons/background-capplet.png
 share/gnome/control-center-2.0/icons/behavior-capplet.png
 share/gnome/control-center-2.0/icons/default-applications-capplet.png
+share/gnome/control-center-2.0/icons/display-capplet.png
 share/gnome/control-center-2.0/icons/font-capplet.png
+share/gnome/control-center-2.0/icons/gnome-network-capplet.png
 share/gnome/control-center-2.0/icons/mouse-capplet.png
 share/gnome/control-center-2.0/icons/sound-capplet.png
 share/gnome/control-center-2.0/icons/window-capplet.png
+share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade
 share/gnome/control-center-2.0/interfaces/background-properties.glade
 share/gnome/control-center-2.0/interfaces/file-types-properties.glade
 share/gnome/control-center-2.0/interfaces/font-properties.glade
@@ -65,15 +103,22 @@ share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
 share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
 share/gnome/control-center-2.0/interfaces/sound-properties.glade
 share/gnome/control-center-2.0/interfaces/theme-install.glade
 share/gnome/control-center-2.0/interfaces/theme-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
+share/gnome/control-center-2.0/pixmaps/at-enable-capplet.png
+share/gnome/control-center-2.0/pixmaps/at-startup.png
+share/gnome/control-center-2.0/pixmaps/at-support.png
+share/gnome/control-center-2.0/pixmaps/bar-disabled.png
+share/gnome/control-center-2.0/pixmaps/bar-green.png
+share/gnome/control-center-2.0/pixmaps/bar-red.png
+share/gnome/control-center-2.0/pixmaps/bar.png
 share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
 share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
@@ -88,23 +133,40 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png
 share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png
 share/gnome/control-center-2.0/pixmaps/mouse-left.png
 share/gnome/control-center-2.0/pixmaps/mouse-right.png
+share/gnome/control-center-2.0/pixmaps/ocean-stripes.png
+share/gnome/control-center-2.0/pixmaps/sound-capplet.png
+share/gnome/control-center-2.0/pixmaps/stop.png
 share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
 share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
 share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png
 share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png
 share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png
+share/gnome/control-center-2.0/pixmaps/visual-bell.png
+share/gnome/control-center-2.0/xrdb/Editres.ad
+share/gnome/control-center-2.0/xrdb/Emacs.ad
+share/gnome/control-center-2.0/xrdb/General.ad
+share/gnome/control-center-2.0/xrdb/Motif.ad
+share/gnome/control-center-2.0/xrdb/Tk.ad
+share/gnome/control-center-2.0/xrdb/Xaw.ad
+share/gnome/control-center/apply-font.glade
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
 share/gnome/gnome-2.0/ui/gnomecc-ui.xml
 share/gnome/idl/ConfigArchiver.idl
 share/gnome/idl/GNOME_SettingsDaemon.idl
+share/gnome/mime-info/fontilus.keys
+share/gnome/mime-info/fontilus.mime
+share/gnome/mime-info/themus.keys
 share/gnome/pixmaps/accessibility-keyboard-capplet.png
+share/gnome/pixmaps/at-enable-capplet.png
 share/gnome/pixmaps/background-capplet.png
 share/gnome/pixmaps/behavior-capplet.png
 share/gnome/pixmaps/control-center2.png
 share/gnome/pixmaps/default-applications-capplet.png
+share/gnome/pixmaps/display-capplet.png
 share/gnome/pixmaps/font-capplet.png
+share/gnome/pixmaps/gnome-ccthemes.png
 share/gnome/pixmaps/gnomecc-2/active.png
 share/gnome/pixmaps/gnomecc-2/bcg_top.png
 share/gnome/pixmaps/gnomecc-2/blank.png
@@ -112,17 +174,20 @@ share/gnome/pixmaps/gnomecc-2/title.png
 share/gnome/pixmaps/keyboard-capplet.png
 share/gnome/pixmaps/keyboard-shortcut.png
 share/gnome/pixmaps/mouse-capplet.png
-share/gnome/pixmaps/sound-capplet.png
 share/gnome/pixmaps/window-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
+share/gnome/vfolders/font-method.directory
+share/gnome/vfolders/theme-method.directory
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
 share/locale/be/LC_MESSAGES/control-center-2.0.mo
 share/locale/bg/LC_MESSAGES/control-center-2.0.mo
+share/locale/bn/LC_MESSAGES/control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/control-center-2.0.mo
 share/locale/cs/LC_MESSAGES/control-center-2.0.mo
+share/locale/cy/LC_MESSAGES/control-center-2.0.mo
 share/locale/da/LC_MESSAGES/control-center-2.0.mo
 share/locale/de/LC_MESSAGES/control-center-2.0.mo
 share/locale/el/LC_MESSAGES/control-center-2.0.mo
@@ -135,8 +200,11 @@ share/locale/fr/LC_MESSAGES/control-center-2.0.mo
 share/locale/ga/LC_MESSAGES/control-center-2.0.mo
 share/locale/gl/LC_MESSAGES/control-center-2.0.mo
 share/locale/he/LC_MESSAGES/control-center-2.0.mo
+share/locale/hi/LC_MESSAGES/control-center-2.0.mo
 share/locale/hr/LC_MESSAGES/control-center-2.0.mo
 share/locale/hu/LC_MESSAGES/control-center-2.0.mo
+share/locale/id/LC_MESSAGES/control-center-2.0.mo
+share/locale/is/LC_MESSAGES/control-center-2.0.mo
 share/locale/it/LC_MESSAGES/control-center-2.0.mo
 share/locale/ja/LC_MESSAGES/control-center-2.0.mo
 share/locale/ko/LC_MESSAGES/control-center-2.0.mo
@@ -161,6 +229,7 @@ share/locale/sr/LC_MESSAGES/control-center-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/control-center-2.0.mo
 share/locale/sv/LC_MESSAGES/control-center-2.0.mo
 share/locale/ta/LC_MESSAGES/control-center-2.0.mo
+share/locale/th/LC_MESSAGES/control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/control-center-2.0.mo
 share/locale/uk/LC_MESSAGES/control-center-2.0.mo
 share/locale/vi/LC_MESSAGES/control-center-2.0.mo
@@ -169,16 +238,29 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/pixmaps/gnomecc-2
 @dirrm share/gnome/cursor-fonts
+@dirrm share/gnome/control-center-2.0/xrdb
 @dirrm share/gnome/control-center-2.0/pixmaps
 @dirrm share/gnome/control-center-2.0/interfaces
 @dirrm share/gnome/control-center-2.0/icons
 @dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-type1
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-type1
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor