[maemo-commits] [maemo-commits] r17997 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: mitch
Date: 2009-04-02 14:48:52 +0300 (Thu, 02 Apr 2009)
New Revision: 17997

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtksettings.c
Log:
2009-04-02  Michael Natterer  <mitch at imendio.com>

	Fixes: NB#90356 - Do not show shortcuts in legacy application
	menus at all

	* gtk/gtksettings.c (gtk_settings_class_init): set the default
	values for enable-accels and enable-mnemonics to FALSE. While this
	is not the right fix (right would be to have gconf handle this,
	also in obscure cases), it definitely works unless an application
	explicitely overrides it. Should revisit this fix in the next
	release cycle.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-04-02 11:38:48 UTC (rev 17996)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-04-02 11:48:52 UTC (rev 17997)
@@ -1,3 +1,15 @@
+2009-04-02  Michael Natterer  <mitch at imendio.com>
+
+	Fixes: NB#90356 - Do not show shortcuts in legacy application
+	menus at all
+
+	* gtk/gtksettings.c (gtk_settings_class_init): set the default
+	values for enable-accels and enable-mnemonics to FALSE. While this
+	is not the right fix (right would be to have gconf handle this,
+	also in obscure cases), it definitely works unless an application
+	explicitely overrides it. Should revisit this fix in the next
+	release cycle.
+
 2009-04-02  Kristian Rietveld  <kris at imendio.com>
 
 	Fixes: NB#95718 - Set correct state for GtkCellView in

Modified: projects/haf/trunk/gtk+/gtk/gtksettings.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtksettings.c	2009-04-02 11:38:48 UTC (rev 17996)
+++ projects/haf/trunk/gtk+/gtk/gtksettings.c	2009-04-02 11:48:52 UTC (rev 17997)
@@ -765,7 +765,11 @@
                                              g_param_spec_boolean ("gtk-enable-mnemonics",
                                                                    P_("Enable Mnemonics"),
                                                                    P_("Whether labels should have mnemonics"),
+#ifdef MAEMO_CHANGES
+                                                                   FALSE,
+#else
                                                                    TRUE,
+#endif /* MAEMO_CHANGES */
                                                                    GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_ENABLE_MNEMONICS);
@@ -782,7 +786,11 @@
                                              g_param_spec_boolean ("gtk-enable-accels",
                                                                    P_("Enable Accelerators"),
                                                                    P_("Whether menu items should have accelerators"),
+#ifdef MAEMO_CHANGES
+                                                                   FALSE,
+#else
                                                                    TRUE,
+#endif /* MAEMO_CHANGES */
                                                                    GTK_PARAM_READWRITE),
                                              NULL);
   g_assert (result == PROP_ENABLE_ACCELS);