merge and update patch from

http://bugzilla.gnome.org/show_bug.cgi?id=134895

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = po libsounds libbackground libwindow-settings libgswitchit gnome-settings-daemon capplets control-center vfs-methods idl schemas typing-break
+SUBDIRS = po libsounds libbackground libwindow-settings libgswitchit gnome-settings-daemon capplets control-center vfs-methods idl schemas $(TYPING_BREAK)
 
 #I removed the root-manager for now
 #

capplets/accessibility/at-properties/at-startup-session.c

@@ -33,7 +33,7 @@ at_startup_string_compare (gconstpointer s1, gconstpointer s2)
 		return strcmp (s1, s2);
 	}
 	else
-		return (s2-s1);
+		return ((char *)s2-(char *)s1);
 }
 
 static GSList *

capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c

@@ -33,6 +33,7 @@
 #include "accessibility-keyboard.h"
 
 #ifdef HAVE_X11_EXTENSIONS_XKB_H
+#  include <X11/X.h>
 #  include <X11/Xlib.h>
 #  include <X11/XKBlib.h>
 #  include <X11/extensions/XKBstr.h>

capplets/common/capplet-util.h

@@ -30,20 +30,6 @@
 
 /* Macros to make certain repetitive tasks a bit easier */
 
-/* Print a debugging message */
-
-#ifdef G_HAVE_ISO_VARARGS
-#  define DEBUG_MSG(str, ...) \
-              g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \
-		     getpid (), G_GNUC_FUNCTION, __VA_ARGS__)
-#elif defined(G_HAVE_GNUC_VARARGS)
-#  define DEBUG_MSG(str, args...) \
-              g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \
-		     getpid (), G_GNUC_FUNCTION, args)
-#else
-#  define DEBUG_MSG(str, args...)
-#endif
-
 /* Retrieve a widget from the Glade object */
 
 #define WID(s) glade_xml_get_widget (dialog, s)

capplets/common/gnome-theme-info.h

@@ -33,7 +33,7 @@
 typedef enum {
   GNOME_THEME_TYPE_METATHEME,
   GNOME_THEME_TYPE_ICON,
-  GNOME_THEME_TYPE_REGULAR,
+  GNOME_THEME_TYPE_REGULAR
 } GnomeThemeType;
 
 typedef enum {
@@ -46,7 +46,7 @@ typedef enum {
 typedef enum {
   GNOME_THEME_METACITY = 1 << 0,
   GNOME_THEME_GTK_2 = 1 << 1,
-  GNOME_THEME_GTK_2_KEYBINDING = 1 << 2,
+  GNOME_THEME_GTK_2_KEYBINDING = 1 << 2
 } GnomeThemeElement;
 
 

capplets/file-types/Makefile.am

@@ -25,4 +25,4 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(VFS_CAPPLET_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(Desktop_in_files)

capplets/file-types/mime-edit-dialog.c

@@ -37,7 +37,7 @@
 
 #include "libuuid/uuid.h"
 
-#undef WID(x)
+#undef WID
 #define WID(x) (glade_xml_get_widget (dialog->p->dialog_xml, x))
 
 enum {

capplets/font/Makefile.am

@@ -1,6 +1,8 @@
 bin_PROGRAMS = gnome-font-properties
 
-gnome_font_properties_LDADD = $(FONT_CAPPLET_LIBS) $(top_builddir)/capplets/common/libcommon.la
+gnome_font_properties_LDADD = \
+	$(top_builddir)/capplets/common/libcommon.la \
+	$(FONT_CAPPLET_LIBS)
 gnome_font_properties_SOURCES = \
 	main.c		
 gnome_font_properties_LDFLAGS = -export-dynamic

capplets/keybindings/eggcellrendererkeys.c

@@ -343,7 +343,7 @@ is_modifier (guint keycode)
   return retval;
 }
 
-void
+static void
 egg_cell_renderer_keys_get_size (GtkCellRenderer *cell,
 				 GtkWidget       *widget,
 				 GdkRectangle    *cell_area,
@@ -351,6 +351,7 @@ egg_cell_renderer_keys_get_size (GtkCellRenderer *cell,
 				 gint            *y_offset,
 				 gint            *width,
 				 gint            *height)
+
 {
   EggCellRendererKeys *keys = (EggCellRendererKeys *) cell;
   GtkRequisition requisition;
@@ -620,7 +621,7 @@ void
 egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
                                         guint                keyval,
 					guint		     keycode,
-                                        GdkModifierType      mask)
+					EggVirtualModifierType  mask)
 {
   char *text;
   gboolean changed;
@@ -670,7 +671,7 @@ egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
 void
 egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys     *keys,
                                         guint                   *keyval,
-                                        GdkModifierType     *mask)
+                                        EggVirtualModifierType  *mask)
 {
   g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
 

capplets/keybindings/eggcellrendererkeys.h

@@ -39,7 +39,7 @@ typedef struct _EggCellRendererKeysClass EggCellRendererKeysClass;
 typedef enum
 {
   EGG_CELL_RENDERER_KEYS_MODE_GTK,
-  EGG_CELL_RENDERER_KEYS_MODE_X,
+  EGG_CELL_RENDERER_KEYS_MODE_X
 } EggCellRendererKeysMode;
 
 struct _EggCellRendererKeys

capplets/mouse/gnome-mouse-properties.c

@@ -81,7 +81,7 @@ enum
 {
 	DOUBLE_CLICK_TEST_OFF,
 	DOUBLE_CLICK_TEST_MAYBE,
-	DOUBLE_CLICK_TEST_ON,
+	DOUBLE_CLICK_TEST_ON
 };
 
 enum

capplets/sound/Makefile.am

@@ -1,6 +1,9 @@
 bin_PROGRAMS = gnome-sound-properties
 
-gnome_sound_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(SOUND_CAPPLET_LIBS) $(top_builddir)/libsounds/libsounds.a
+gnome_sound_properties_LDADD = \
+	$(top_builddir)/libsounds/libsounds.a \
+	$(GNOMECC_CAPPLETS_LIBS) \
+	$(SOUND_CAPPLET_LIBS)
 gnome_sound_properties_SOURCES = sound-properties-capplet.c
 
 @INTLTOOL_DESKTOP_RULE@

capplets/theme-switcher/gnome-theme-manager.c

@@ -58,8 +58,8 @@ static gboolean idle_running = FALSE;
 static gboolean initial_meta_theme_set = FALSE;
 static GdkPixbuf *default_image = NULL;
 
-static GnomeThemeMetaInfo custom_meta_theme_info = {};
+static GnomeThemeMetaInfo custom_meta_theme_info;
-static GnomeThemeMetaInfo initial_meta_theme_info = {};
+static GnomeThemeMetaInfo initial_meta_theme_info;
 
 const char *meta_theme_default_name = NULL; 
 const char *gtk_theme_default_name = NULL; 

capplets/theme-switcher/gnome-theme-manager.h

@@ -22,7 +22,7 @@ extern const char *icon_theme_default_name;
 enum
 {
   TARGET_URI_LIST,
-  TARGET_NS_URL,
+  TARGET_NS_URL
 };
 
 /* model info */
@@ -38,7 +38,7 @@ enum
 {
   THEME_FLAG_DEFAULT = 1 << 0,
   THEME_FLAG_CUSTOM  = 1 << 1,
-  THEME_FLAG_INITIAL  = 1 << 2,
+  THEME_FLAG_INITIAL  = 1 << 2
 };
 
 extern GtkTargetEntry drop_types[];

capplets/theme-switcher/gnome-theme-save.c

@@ -9,7 +9,7 @@
 static GQuark error_quark;
 enum
 {
-  INVALID_THEME_NAME,
+  INVALID_THEME_NAME
 };
 
 /* taken from gnome-desktop-item.c */

configure.in

@@ -41,8 +41,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 AM_GLIB_GNU_GETTEXT
 
 AC_CHECK_FUNCS(usleep)
-AC_CHECK_FUNCS(putenv,[AC_DEFINE(HAVE_PUTENV,,[putenv])])
+AC_CHECK_FUNCS(putenv)
-AC_CHECK_FUNCS(setenv,[AC_DEFINE(HAVE_SETENV,,[setenv])])
+AC_CHECK_FUNCS(setenv)
 AC_CHECK_FUNCS(ngettext, have_ngettext=yes)
 
 if test x"$have_ngettext" != "xyes"; then
@@ -52,6 +52,24 @@ fi;
 AC_PATH_XTRA
 x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
 
+AC_CHECK_FUNC(XScreenSaverQueryInfo, [
+  TYPING_BREAK="typing-break"],[
+  AC_MSG_CHECKING([for XScreenSaverQueryInfo in -lXss])
+  save_LDFLAGS=$LDFLAGS
+  save_LIBS=$LIBS
+  LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"
+  AC_TRY_LINK([#include <X11/Xlib.h>
+#include <X11/extensions/scrnsaver.h>],[
+XScreenSaverQueryInfo(NULL, 0, NULL);],[
+  AC_MSG_RESULT(yes)
+  TYPING_BREAK="typing-break"
+  SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"],[
+  AC_MSG_RESULT(no)])
+  LIBS=$save_LIBS
+  LDFLAGS=$save_LDFLAGS])
+AC_SUBST(TYPING_BREAK)
+AC_SUBST(SCREENSAVER_LIBS)
+
 dnl keyboard-properties-capplet
 savecppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -364,8 +382,8 @@ COMMON_LIBS="\$(top_builddir)/capplets/common/libcommon.la"
 
 EXTRA_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\\\"\" -DGNOMELOCALEDIR=\"\\\"${prefix}/${DATADIRNAME}/locale\\\"\""
 
-GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} ${EXTRA_CFLAGS} ${COMMON_CFLAGS}"
+GNOMECC_CAPPLETS_CFLAGS="${COMMON_CFLAGS} ${CAPPLET_CFLAGS} ${EXTRA_CFLAGS}"
-GNOMECC_CAPPLETS_LIBS="${CAPPLET_LIBS} ${COMMON_LIBS}"
+GNOMECC_CAPPLETS_LIBS="${COMMON_LIBS} ${CAPPLET_LIBS}"
 
 GNOMECC_CAPPLETS_CLEANFILES="\$(desktop) \$(desktop).in"
 GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(cappletname)-capplet.png \$(cappletname)-properties.glade \$(pixmaps_DATA)"

control-center/capplet-dir.c

@@ -342,7 +342,7 @@ read_entries (CappletDir *dir)
 		if (child->type == GNOME_VFS_FILE_TYPE_DIRECTORY) {
 		        entry = capplet_dir_new (dir, fullpath);
 		} else {
-			test = rindex(child->name, '.');
+			test = strrchr(child->name, '.');
 
 			/* if it's a .desktop file, it's interesting for sure! */
 			if (test && !strcmp (".desktop", test))

gnome-settings-daemon/Makefile.am

@@ -59,12 +59,12 @@ gnome_settings_daemon_SOURCES =	\
 
 gnome_settings_daemon_LDADD = \
 	$(LIBXKLAVIER_LIBS)						\
-	$(GNOME_SETTINGS_DAEMON_LIBS)					\
 	$(top_builddir)/libbackground/libbackground.la			\
 	$(top_builddir)/libsounds/libsounds.a				\
 	$(top_builddir)/libgswitchit/libgswitchit.a			\
 	$(top_builddir)/libwindow-settings/libgnome-window-settings.la 	\
 	$(top_builddir)/gnome-settings-daemon/actions/libacme.la	\
+	$(GNOME_SETTINGS_DAEMON_LIBS)					\
 	$(XF86MISC_LIBS)
 
 #AccessX_files = \

gnome-settings-daemon/factory.c

@@ -16,7 +16,9 @@ int main (int argc, char *argv [])
 {
   GnomeClient *session;
   Bonobo_RegistrationResult ret;
-  gchar *restart_argv[] = { "gnome-settings-daemon", *argv, 0 };
+  gchar *restart_argv[] = { "gnome-settings-daemon", NULL, 0 };
+
+  restart_argv[1] = *argv;
 
   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");

gnome-settings-daemon/reaper.c

@@ -29,12 +29,6 @@
 #include <gtk/gtkmarshal.h>
 #include "reaper.h"
 
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#else
-#define bindtextdomain(package,dir)
-#endif
-
 #ifdef ENABLE_NLS
 #include <libintl.h>
 #define _(String) dgettext(PACKAGE, String)

po/POTFILES.in

@@ -23,19 +23,6 @@ capplets/default-applications/gnome-default-applications-properties.c
 capplets/default-applications/gnome-default-applications-properties.glade
 capplets/desktop-links/Accessibility.directory.in
 capplets/desktop-links/Advanced.directory.in
-capplets/desktop-links/Sawfish/Sawfish.directory.in.in
-capplets/desktop-links/Sawfish/appearance-properties.desktop.in
-capplets/desktop-links/Sawfish/bindings-properties.desktop.in
-capplets/desktop-links/Sawfish/focus-properties.desktop.in
-capplets/desktop-links/Sawfish/match-properties.desktop.in
-capplets/desktop-links/Sawfish/maximize-properties.desktop.in
-capplets/desktop-links/Sawfish/meta-properties.desktop.in
-capplets/desktop-links/Sawfish/misc-properties.desktop.in
-capplets/desktop-links/Sawfish/move-properties.desktop.in
-capplets/desktop-links/Sawfish/placement-properties.desktop.in
-capplets/desktop-links/Sawfish/sound-properties.desktop.in
-capplets/desktop-links/Sawfish/workspace-properties.desktop.in
-capplets/desktop-links/legacy-applications.desktop.in.in
 capplets/display/display-properties.desktop.in
 capplets/display/main.c
 capplets/file-types/file-types-capplet.c
@@ -67,8 +54,6 @@ capplets/network/gnome-network-preferences.glade
 capplets/sound/gnome-settings-sound.desktop.in
 capplets/sound/sound-properties-capplet.c
 capplets/sound/sound-properties.glade
-capplets/theme-switcher/control/GNOME_Theme_Preview.server.in
-capplets/theme-switcher/control/control.c
 capplets/theme-switcher/gnome-theme-details.c
 capplets/theme-switcher/gnome-theme-installer.c
 capplets/theme-switcher/gnome-theme-manager.c
@@ -76,7 +61,6 @@ capplets/theme-switcher/gnome-theme-save.c
 capplets/theme-switcher/gtk-theme-selector.desktop.in
 capplets/theme-switcher/theme-install.glade
 capplets/theme-switcher/theme-properties.glade
-capplets/theme-switcher/theme-switcher.c
 capplets/ui-properties/gnome-ui-properties.c
 capplets/ui-properties/gnome-ui-properties.desktop.in
 capplets/ui-properties/gnome-ui-properties.glade

schemas/Makefile.am

@@ -22,4 +22,4 @@ else
 install-data-local:
 endif
 
-EXTRA_DIST=$(schema_DATA)
+EXTRA_DIST=$(schema_in_files) $(schema_DATA)

typing-break/Makefile.am

@@ -22,7 +22,7 @@ gnome_typing_monitor_SOURCES =			\
 	egg-spawn.c				\
 	egg-spawn.h
 
-gnome_typing_monitor_LDADD = @GNOME_LIBS@ -L/usr/X11R6/lib -lXss
+gnome_typing_monitor_LDADD = @GNOME_LIBS@ @SCREENSAVER_LIBS@
 gnome_typing_monitor_LDFLAGS = -export-dynamic
 
 imagedir = $(GNOMECC_PIXMAPS_DIR)

vfs-methods/fontilus/font-method.c

@@ -767,25 +767,32 @@ do_monitor_cancel(GnomeVFSMethod *method,
 static GnomeVFSMethod method = {
     sizeof(GnomeVFSMethod),
 
-    .open     = do_open,
+    do_open,
-    .create   = do_create,
+    do_create,
-    .close    = do_close,
+    do_close,
-    .read     = do_read,
+    do_read,
-    .write    = do_write,
+    do_write,
-    .seek     = do_seek,
+    do_seek,
-    .tell     = do_tell,
+    do_tell,
-    .get_file_info_from_handle = do_get_file_info_from_handle,
+    NULL,
-
+    do_open_directory,
-    .open_directory  = do_open_directory,
+    do_close_directory,
-    .close_directory = do_close_directory,
+    do_read_directory,
-    .read_directory  = do_read_directory,
+    do_get_file_info,
-
+    do_get_file_info_from_handle,
-    .get_file_info = do_get_file_info,
+    do_is_local,
-    .is_local      = do_is_local,
+    NULL,
-    .unlink        = do_unlink,
+    NULL,
-
+    NULL,
-    .monitor_add = do_monitor_add,
+    do_unlink,
-    .monitor_cancel = do_monitor_cancel
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    do_monitor_add,
+    do_monitor_cancel,
+    NULL
 };
 
 GnomeVFSMethod *

vfs-methods/fontilus/font-view.c

@@ -38,6 +38,7 @@
 #include FT_TYPE1_TABLES_H
 #include FT_SFNT_NAMES_H
 #include FT_TRUETYPE_IDS_H
+#include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>

vfs-methods/themus/Makefile.am

@@ -6,8 +6,6 @@ INCLUDES = $(THEME_METHOD_CFLAGS) \
   -DDIRECTORY_DIR=\"$(vfsdirectorydir)\" \
   -DDATA_DIR=\"$(datadir)/themus\"
 
-AM_CFLAGS = -g
-
 bin_PROGRAMS = gnome-theme-thumbnailer themus-theme-applier
 
 vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules

vfs-methods/themus/theme-method.c

@@ -221,13 +221,13 @@ typedef struct _ThemeHandle ThemeHandle;
 struct _ThemeHandle {
     GnomeVFSMethodHandle *handle;
 
-    // if we're listing themes....
+    /* if we're listing themes.... */
     GList *theme;
     GnomeVFSFileInfoOptions options;
     gboolean seen_dotdirectory;
     
-    // if we're doing a file....
+    /* if we're doing a file.... */
-    gchar *uri; // the real URI
+    gchar *uri; /* the real URI */
 };
 
 /* -- VFS method -- */
@@ -664,25 +664,39 @@ do_monitor_cancel(GnomeVFSMethod *method,
 static GnomeVFSMethod method = {
     sizeof(GnomeVFSMethod),
 
-    .open     = do_open,
+    do_open,
-    .create   = do_create,
+    do_create,
-    .close    = do_close,
+    do_close,
-    .read     = do_read,
+    do_read,
-    .write    = do_write,
+    do_write,
-    .seek     = do_seek,
+    do_seek,
-    .tell     = do_tell,
+    do_tell,
-    .get_file_info_from_handle = do_get_file_info_from_handle,
 
-    .open_directory  = do_open_directory,
+    NULL,
-    .close_directory = do_close_directory,
-    .read_directory  = do_read_directory,
 
-    .get_file_info = do_get_file_info,
+    do_open_directory,
-    .is_local      = do_is_local,
+    do_close_directory,
-    .unlink        = do_unlink,
+    do_read_directory,
+    do_get_file_info,
+    do_get_file_info_from_handle,
+    do_is_local,
 
-    .monitor_add = do_monitor_add,
+    NULL,
-    .monitor_cancel = do_monitor_cancel
+    NULL,
+    NULL,
+
+    do_unlink,
+
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+
+    do_monitor_add,
+    do_monitor_cancel,
+
+    NULL
 };
 
 GnomeVFSMethod*

vfs-methods/themus/themus-properties-view.c

@@ -40,7 +40,7 @@ struct ThemusThemePropertiesViewDetails {
 };
 
 enum {
-	PROP_URI,
+	PROP_URI
 };
 
 static GObjectClass *parent_class = NULL;