[maemo-commits] [maemo-commits] r11773 - in projects/haf/trunk/gtk+: . gdk/x11

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-05-23 14:53:30 +0300 (Wed, 23 May 2007)
New Revision: 11773

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdksettings.c
Log:
add forgotten MAEMO_CHANGES

2007-05-23  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gdk/x11/gdksettings.c (gdk_settings_names, gdk_settings_map): add
	forgotten MAEMO_CHANGES


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-23 11:43:30 UTC (rev 11772)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-23 11:53:30 UTC (rev 11773)
@@ -1,3 +1,8 @@
+2007-05-23  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gdk/x11/gdksettings.c (gdk_settings_names, gdk_settings_map): add
+	forgotten MAEMO_CHANGES
+
 2007-05-23  Michael Natterer  <mitch at imendio.com>
 
 	* gtk/gtkmenushell.[ch]

Modified: projects/haf/trunk/gtk+/gdk/x11/gdksettings.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdksettings.c	2007-05-23 11:43:30 UTC (rev 11772)
+++ projects/haf/trunk/gtk+/gdk/x11/gdksettings.c	2007-05-23 11:53:30 UTC (rev 11773)
@@ -66,8 +66,11 @@
   "Xft/DPI\0"                 "gtk-xft-dpi\0"
   "Net/FallbackIconTheme\0"   "gtk-fallback-icon-theme\0"
   "Gtk/TouchscreenMode\0"     "gtk-touchscreen-mode\0"
+#ifdef MAEMO_CHANGES
   "Gtk/EnableAccels\0"        "gtk-enable-accels\0"
-  "Gtk/EnableMnemonics\0"     "gtk-enable-mnemonics\0";
+  "Gtk/EnableMnemonics\0"     "gtk-enable-mnemonics\0"
+#endif /* MAEMO_CHANGES */
+  ;
 
 static const struct
 {
@@ -109,7 +112,10 @@
   { 1197, 1206 },
   { 1219, 1227 },
   { 1239, 1261 },
-  { 1285, 1305 },
+  { 1285, 1305 }
+#ifdef MAEMO_CHANGES
+  ,
   { 1326, 1343 },
   { 1361, 1381 }
+#endif /* MAEMO_CHANGES */
 };