merge and update patch from

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

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;
@@ -668,9 +669,9 @@ egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
 }
 
 void
-egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
-                                        guint               *keyval,
-                                        GdkModifierType     *mask)
+egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys     *keys,
+                                        guint                   *keyval,
+                                        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 initial_meta_theme_info = {};
+static GnomeThemeMetaInfo custom_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 */

capplets/windows/Makefile.am

@@ -16,7 +16,7 @@ Desktop_in_files = window-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)					\
-	     -I $(top_srcdir)/libwindow-settings \
+	     -I$(top_srcdir)/libwindow-settings \
 	     -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \
 	     -DGLADEDIR=\""$(gladedir)"\"  	\
 	     -DPIXMAPDIR=\""$(pixmapdir)"\"