Merge lp:~ted/libdbusmenu/lp903200 into lp:libdbusmenu/0.6

[Ted Gould]

Being more explicit about what is a mnemonic and what is not.

[Charles Kerr (charlesk)]

review: Approve

=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c	2012-03-01 22:25:25 +0000
+++ libdbusmenu-gtk/genericmenuitem.c	2012-04-09 17:14:18 +0000
@@ -216,6 +216,31 @@
 	return g_strdup(values[disposition].default_color);
 }
 
+/* Check to see if we've got mnemonic stuff goin' on */
+static gboolean
+has_mnemonic (const gchar * string, gboolean previous_underscore)
+{
+	if (string == NULL || string[0] == '\0') {
+		return FALSE;
+	}
+
+	if (g_utf8_get_char(string) == '_') {
+		if (previous_underscore) {
+			return has_mnemonic(g_utf8_next_char(string), FALSE);
+		} else {
+			return has_mnemonic(g_utf8_next_char(string), TRUE);
+		}
+	} else {
+		if (previous_underscore) {
+			return TRUE;
+		} else {
+			return has_mnemonic(g_utf8_next_char(string), FALSE);
+		}
+	}
+
+	return FALSE;
+}
+
 /* Set the label on the item */
 static void
 set_label (GtkMenuItem * menu_item, const gchar * in_label)
@@ -287,11 +312,15 @@
 	if (labelw == NULL) {
 		/* Build it */
 		labelw = GTK_LABEL(gtk_accel_label_new(local_label));
-		gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
 		gtk_label_set_use_markup(GTK_LABEL(labelw), TRUE);
 		gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);
-		gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
-		gtk_label_set_markup_with_mnemonic(labelw, local_label);
+
+		if (has_mnemonic(in_label, FALSE)) {
+			gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
+			gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
+			gtk_label_set_markup_with_mnemonic(labelw, local_label);
+		}
+
 		gtk_widget_show(GTK_WIDGET(labelw));
 
 		/* Check to see if it needs to be in the bin for this
@@ -309,7 +338,13 @@
 			   getting in. */
 			suppress_update = TRUE;
 		} else {
-			gtk_label_set_markup_with_mnemonic(labelw, local_label);
+			if (has_mnemonic(in_label, FALSE)) {
+				gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
+				gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
+				gtk_label_set_markup_with_mnemonic(labelw, local_label);
+			} else {
+				gtk_label_set_markup(labelw, local_label);
+			}
 		}
 	}