map "gtk-touchscreen-mode" to the "Gtk/TouchscreenMode" XSettings

2006-02-27  Michael Natterer  <mitch@imendio.com>

	* gdk/x11/gdksettings.c: map "gtk-touchscreen-mode" to the
	"Gtk/TouchscreenMode" XSettings property, remove trailing
	whitespace.

	* gdk/x11/checksettings.c: #include <string.h> and sprinkled some
	newlines.

diff --git a/ChangeLog b/ChangeLog
index d5e3dd1c553eaec8aa9309a40dfffb8a58aba6ff..3dd85b75658e2087c719cc454bf57f9ba5d5608a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-27  Michael Natterer  <mitch@imendio.com>
+
+       * gdk/x11/gdksettings.c: map "gtk-touchscreen-mode" to the
+       "Gtk/TouchscreenMode" XSettings property, remove trailing
+       whitespace.
+
+       * gdk/x11/checksettings.c: #include <string.h> and sprinkled some
+       newlines.
+
 Mon Feb 27 14:52:50 2006  Tim Janik  <timj@imendio.com>
 
        * gdkevents-x11.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d5e3dd1c553eaec8aa9309a40dfffb8a58aba6ff..3dd85b75658e2087c719cc454bf57f9ba5d5608a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2006-02-27  Michael Natterer  <mitch@imendio.com>
+
+       * gdk/x11/gdksettings.c: map "gtk-touchscreen-mode" to the
+       "Gtk/TouchscreenMode" XSettings property, remove trailing
+       whitespace.
+
+       * gdk/x11/checksettings.c: #include <string.h> and sprinkled some
+       newlines.
+
 Mon Feb 27 14:52:50 2006  Tim Janik  <timj@imendio.com>
 
        * gdkevents-x11.c:

diff --git a/gdk/x11/checksettings.c b/gdk/x11/checksettings.c
index ee47cab60d07aae36d893901bab53b0df8f61869..ea6ca3a258dae7257b32290c9b354910247bb0ba 100644 (file)
--- a/gdk/x11/checksettings.c
+++ b/gdk/x11/checksettings.c
@@ -16,13 +16,17 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
+
+#include <string.h>
 #include <glib.h>
 #include "gdksettings.c"
+
 int
 main (int   argc,
       char *argv[])
 {
   guint i, accu = 0;
+
   for (i = 0; i < GDK_SETTINGS_N_ELEMENTS(); i++)
     {
       if (gdk_settings_map[i].xsettings_offset != accu)
@@ -33,6 +37,8 @@ main (int   argc,
       accu += strlen (gdk_settings_names + accu) + 1;
       // g_print ("%u) ok.\n", i);
     }
+
   g_print ("checksettings: all ok.\n");
+
   return 0;
 }

diff --git a/gdk/x11/gdksettings.c b/gdk/x11/gdksettings.c
index 87bc2f44ae4073c9a5a49f7c4b43581b5ebad9d7..654998d7a2d4444fa3b60582d6240ecc14c301d2 100644 (file)
--- a/gdk/x11/gdksettings.c
+++ b/gdk/x11/gdksettings.c
@@ -21,7 +21,7 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 
@@ -29,13 +29,13 @@
 #define GDK_SETTINGS_X_NAME(nth)        (gdk_settings_names + gdk_settings_map[nth].xsettings_offset)
 #define GDK_SETTINGS_GDK_NAME(nth)      (gdk_settings_names + gdk_settings_map[nth].gdk_offset)
 
-static const char gdk_settings_names[] = 
+static const char gdk_settings_names[] =
   "Net/DoubleClickTime\0"     "gtk-double-click-time\0"
   "Net/DoubleClickDistance\0" "gtk-double-click-distance\0"
   "Net/DndDragThreshold\0"    "gtk-dnd-drag-threshold\0"
   "Net/CursorBlink\0"         "gtk-cursor-blink\0"
   "Net/CursorBlinkTime\0"     "gtk-cursor-blink-time\0"
-  "Net/ThemeName\0"           "gtk-theme-name\0" 
+  "Net/ThemeName\0"           "gtk-theme-name\0"
   "Net/IconThemeName\0"       "gtk-icon-theme-name\0"
   "Gtk/CanChangeAccels\0"     "gtk-can-change-accels\0"
   "Gtk/ColorPalette\0"        "gtk-color-palette\0"
@@ -64,7 +64,8 @@ static const char gdk_settings_names[] =
   "Xft/HintStyle\0"           "gtk-xft-hintstyle\0"
   "Xft/RGBA\0"                "gtk-xft-rgba\0"
   "Xft/DPI\0"                 "gtk-xft-dpi\0"
-  "Net/FallbackIconTheme\0"   "gtk-fallback-icon-theme\0";
+  "Net/FallbackIconTheme\0"   "gtk-fallback-icon-theme\0"
+  "Gtk/TouchscreenMode\0"     "gtk-touchscreen-mode\0";
 
 static const struct
 {
@@ -105,5 +106,6 @@ static const struct
   { 1165, 1179 },
   { 1197, 1206 },
   { 1219, 1227 },
-  { 1239, 1261 }
+  { 1239, 1261 },
+  { 1285, 1305 }
 };