ayatana-commits team mailing list archive

[Jason Conti <jason.conti@xxxxxxxxx>]

Jason Conti has proposed merging lp:~jconti/indicator-datetime/escape_date_settings into lp:indicator-datetime.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~jconti/indicator-datetime/escape_date_settings/+merge/83455

The generic dbusmenu menuitem has markup enabled by default, so when setting the label to 'Time & Date Settings...' in src/datetime-service.c the following warning gets dumped to the logs:

Failed to set text from markup due to error parsing markup: Error on line 1: Entity did not end with a semicolon; most likely you used an ampersand character without intending to start an entity - escape ampersand as &

This branch just passes the translated string to g_markup_escape_text before setting the label. Another option is to replace the string with 'Time & Date Settings...' but I didn't want to mess up the translations.
-- 
https://code.launchpad.net/~jconti/indicator-datetime/escape_date_settings/+merge/83455
Your team ayatana-commits is subscribed to branch lp:indicator-datetime.

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-10-13 04:30:40 +0000
+++ src/datetime-service.c	2011-11-25 23:02:23 +0000
@@ -1143,7 +1143,8 @@
 		dbusmenu_menuitem_child_append(root, separator);
 
 		settings = dbusmenu_menuitem_new();
-		dbusmenu_menuitem_property_set     (settings, DBUSMENU_MENUITEM_PROP_LABEL, _("Time & Date Settings…"));
+		dbusmenu_menuitem_property_set (settings, DBUSMENU_MENUITEM_PROP_LABEL, 
+                    g_markup_escape_text(_("Time & Date Settings…"), -1));
 		/* insensitive until we check for available apps */
 		dbusmenu_menuitem_property_set_bool(settings, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
 		g_signal_connect(G_OBJECT(settings), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), "gnome-control-center indicator-datetime");