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

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-05-14 11:13:47 +0300 (Mon, 14 May 2007)
New Revision: 11622

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gdk/x11/gdksettings.c
Log:
Add Gtk/EnableAccels and Gtk/EnableMnemonics xsettings

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

	* gdk/x11/gdksettings.c (gdk_settings_names, gdk_settings_map): Add
	Gtk/EnableAccels and Gtk/EnableMnemonics xsettings for
	gtk-enable-accels and gtk-enable-mnemonics GtkSettings respectively
	(#436536)


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-05-14 08:09:54 UTC (rev 11621)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-05-14 08:13:47 UTC (rev 11622)
@@ -1,3 +1,10 @@
+2007-05-14  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gdk/x11/gdksettings.c (gdk_settings_names, gdk_settings_map): Add
+	Gtk/EnableAccels and Gtk/EnableMnemonics xsettings for
+	gtk-enable-accels and gtk-enable-mnemonics GtkSettings respectively
+	(#436536)
+
 2007-05-11  Michael Natterer  <mitch at imendio.com>
 
 	Merge all GtkTextView fixes from the gtk-2-10 branch. The last

Modified: projects/haf/trunk/gtk+/gdk/x11/gdksettings.c
===================================================================
--- projects/haf/trunk/gtk+/gdk/x11/gdksettings.c	2007-05-14 08:09:54 UTC (rev 11621)
+++ projects/haf/trunk/gtk+/gdk/x11/gdksettings.c	2007-05-14 08:13:47 UTC (rev 11622)
@@ -65,7 +65,9 @@
   "Xft/RGBA\0"                "gtk-xft-rgba\0"
   "Xft/DPI\0"                 "gtk-xft-dpi\0"
   "Net/FallbackIconTheme\0"   "gtk-fallback-icon-theme\0"
-  "Gtk/TouchscreenMode\0"     "gtk-touchscreen-mode\0";
+  "Gtk/TouchscreenMode\0"     "gtk-touchscreen-mode\0"
+  "Gtk/EnableAccels\0"        "gtk-enable-accels\0"
+  "Gtk/EnableMnemonics\0"     "gtk-enable-mnemonics\0";
 
 static const struct
 {
@@ -107,5 +109,7 @@
   { 1197, 1206 },
   { 1219, 1227 },
   { 1239, 1261 },
-  { 1285, 1305 }
+  { 1285, 1305 },
+  { 1326, 1343 },
+  { 1361, 1381 }
 };