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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-10-31 17:36:33 +0200 (Wed, 31 Oct 2007)
New Revision: 14689

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtklabel.c
Log:
Do not recalculate state on notify::{gtk-enable-accels,gtk-enable-mnemonics} unconditionally.

Instead of doing it for all GtkLabels only do it for those that are GtkAccelLabel or those
using mnemonics. Fixes NB#74392.


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-10-31 13:53:32 UTC (rev 14688)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-10-31 15:36:33 UTC (rev 14689)
@@ -1,3 +1,12 @@
+2007-10-31  Xan Lopez  <xan.lopez at nokia.com>
+
+	* gtk/gtklabel.c (label_shortcut_setting_traverse_container): Do not
+	recalculate state on notify::{gtk-enable-accels,gtk-enable-mnemonics}
+	unconditionally.
+
+	Instead of doing it for all GtkLabels only do it for those that
+	are GtkAccelLabel or those using mnemonics. Fixes NB#74392.
+
 2007-10-16  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtkcontainer.c (gtk_container_idle_sizer): 

Modified: projects/haf/trunk/gtk+/gtk/gtklabel.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtklabel.c	2007-10-31 13:53:32 UTC (rev 14688)
+++ projects/haf/trunk/gtk+/gtk/gtklabel.c	2007-10-31 15:36:33 UTC (rev 14689)
@@ -978,7 +978,9 @@
 label_shortcut_setting_traverse_container (GtkWidget *widget,
                                            gpointer   data)
 {
-  if (GTK_IS_LABEL (widget))
+  if (GTK_IS_LABEL (widget) &&
+      (gtk_label_get_use_underline (GTK_LABEL (widget)) ||
+       GTK_IS_ACCEL_LABEL (widget)))
     label_shortcut_setting_apply (GTK_LABEL (widget));
   else if (GTK_IS_CONTAINER (widget))
     gtk_container_forall (GTK_CONTAINER (widget),