Merge lp:~mterry/libdbusmenu/pass-mnemonics into lp:libdbusmenu/0.5

[Michael Terry]

This passes the mnemonics and markup from GtkLabel to the dbusmenuitem.

Interestingly, for appmenu, the mnemonics are always shown (instead of only when Alt is pressed), but that's a separate issue, affecting the indicator side of things.

[Ted Gould (ted)]

I'm not sure if we want to have markup passed to dbusmenu. Mnemonics yes, but markup I'm not as sure about. It seems like we'd need a filter or want to encode that perhaps more sensibly than allowing for single bold or italic words for instance.

[lp:~mterry/libdbusmenu/pass-mnemonics]

258. By Michael Terry on 2011-03-09

sanitize label text to strip pango markup

[Michael Terry (mterry)]

Here's a version that strips pango markup.

[Ted Gould (ted)]

Thanks, I think we need to handle the markup at some point and have a more general solution. I don't think we're ready for that yet :)

review: Approve

=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2011-03-01 17:41:58 +0000
+++ libdbusmenu-gtk/parser.c	2011-03-09 13:29:11 +0000
@@ -340,6 +340,23 @@
 	return;
 }
 
+static gchar *
+sanitize_label_text (const gchar * label)
+{
+	/* Label contains underscores, which we like, and pango markup,
+           which we don't. */
+	gchar * sanitized = NULL;
+	GError * error = NULL;
+	if (pango_parse_markup (label, -1, 0, NULL, &sanitized, NULL, &error)) {
+		return sanitized;
+	}
+	else {
+		g_warning ("Could not parse '%s': %s", label, error->message);
+		g_error_free (error);
+		return g_strdup (label);
+	}
+}
+
 /* Turn a widget into a dbusmenu item depending on the type of GTK
    object that it is. */
 static DbusmenuMenuitem *
@@ -423,9 +440,9 @@
             {
               // Sometimes, an app will directly find and modify the label
               // (like empathy), so watch the label especially for that.
-              dbusmenu_menuitem_property_set (mi,
-                                              "label",
-                                              gtk_label_get_text (GTK_LABEL (label)));
+              gchar * text = sanitize_label_text (gtk_label_get_label (GTK_LABEL (label)));
+              dbusmenu_menuitem_property_set (mi, "label", text);
+              g_free (text);
 
               pdata->label = label;
               g_signal_connect (G_OBJECT (label),
@@ -668,9 +685,11 @@
 
   if (pspec->name == g_intern_static_string ("label"))
     {
+      gchar * text = sanitize_label_text (gtk_label_get_label (GTK_LABEL (widget)));
       dbusmenu_menuitem_property_set (child,
                                       DBUSMENU_MENUITEM_PROP_LABEL,
-                                      gtk_label_get_text (GTK_LABEL (widget)));
+                                      text);
+      g_free (text);
     }
 }
 
@@ -724,9 +743,11 @@
     }
   else if (pspec->name == g_intern_static_string ("label"))
     {
+      gchar * text = sanitize_label_text (gtk_action_get_label (action));
       dbusmenu_menuitem_property_set (mi,
                                       DBUSMENU_MENUITEM_PROP_LABEL,
-                                      gtk_action_get_label (action));
+                                      text);
+      g_free (text);
     }
 }