Merge branch 'master' of git://git.sugarlabs.org/sugar/frans-clone

Conflicts:
	extensions/deviceicon/network.py

2 files changed, 9 insertions, 4 deletions

diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index 227ba46..b61de22 100644
--- a/extensions/deviceicon/network.py
+++ b/extensions/deviceicon/network.py
@@ -27,6 +27,7 @@ import re
 import datetime
 import time
 import gtk
+import glib
 import gobject
 import gconf
 import dbus
@@ -471,7 +472,7 @@ class WirelessDeviceView(ToolButton):
         else:
             self._icon.props.badge_name = None
 
-        self._palette.props.primary_text = self._name
+        self._palette.props.primary_text = glib.markup_escape_text(self._name)
 
         self._update_state()
         self._update_color()
@@ -649,7 +650,8 @@ class OlpcMeshDeviceView(ToolButton):
             self._update_text()
 
     def _update_text(self):
-        text = _("Mesh Network") + " " + str(self._channel)
+        channel = str(self._channel)
+        text = _("Mesh Network %s") % glib.markup_escape_text(channel)
         self._palette.props.primary_text = text
 
     def _update(self):
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index e5ef720..bc7f59b 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -22,6 +22,7 @@ import hashlib
 
 import dbus
 import hippo
+import glib
 import gobject
 import gtk
 
@@ -157,7 +158,7 @@ class WirelessNetworkView(CanvasPulsingIcon):
                                   icon_size=style.STANDARD_ICON_SIZE,
                                   badge_name=self.props.badge_name)
 
-        p = palette.Palette(primary_text=self._name,
+        p = palette.Palette(primary_text=glib.markup_escape_text(self._name),
                             icon=self._palette_icon)
 
         self._connect_item = MenuItem(_('Connect'), 'dialog-ok')
@@ -617,10 +618,12 @@ class ActivityView(hippo.CanvasBox):
         return icon
 
     def _create_palette(self):
+        p_text = glib.markup_escape_text(self._model.activity.props.name)
         p_icon = Icon(file=self._model.get_icon_name(),
                       xo_color=self._model.get_color())
         p_icon.props.icon_size = gtk.ICON_SIZE_LARGE_TOOLBAR
-        p = palette.Palette(None, primary_text=self._model.activity.props.name,
+        p = palette.Palette(None,
+                            primary_text=p_text,
                             icon=p_icon)
 
         private = self._model.activity.props.private