diff options
Diffstat (limited to 'src/jarabe/view')
| -rw-r--r-- | src/jarabe/view/buddymenu.py | 6 | ||||
| -rw-r--r-- | src/jarabe/view/palettes.py | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py index f1b7163..2d2a7fa 100644 --- a/src/jarabe/view/buddymenu.py +++ b/src/jarabe/view/buddymenu.py @@ -20,7 +20,7 @@ from gettext import gettext as _ from gi.repository import Gtk from gi.repository import GConf -import glib +from gi.repository import GLib import dbus from sugar3.graphics.palette import Palette @@ -44,7 +44,7 @@ class BuddyMenu(Palette): icon_size=Gtk.IconSize.LARGE_TOOLBAR) nick = buddy.get_nick() Palette.__init__(self, None, - primary_text=glib.markup_escape_text(nick), + primary_text=GLib.markup_escape_text(nick), icon=buddy_icon) self.menu_box = Gtk.VBox() self.set_content(self.menu_box) @@ -156,7 +156,7 @@ class BuddyMenu(Palette): self._update_invite_menu(activity_model) def __buddy_notify_nick_cb(self, buddy, pspec): - self.set_primary_text(glib.markup_escape_text(buddy.props.nick)) + self.set_primary_text(GLib.markup_escape_text(buddy.props.nick)) def _make_friend_cb(self, menuitem): friends.get_model().make_friend(self._buddy) diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py index 34944f3..cc15408 100644 --- a/src/jarabe/view/palettes.py +++ b/src/jarabe/view/palettes.py @@ -20,7 +20,7 @@ from gettext import gettext as _ import logging from gi.repository import GConf -import glib +from gi.repository import GLib from gi.repository import Gtk from gi.repository import GObject @@ -49,7 +49,7 @@ class BasePalette(Palette): if home_activity.props.launch_status == shell.Activity.LAUNCHING: self._notify_launch_hid = home_activity.connect( \ 'notify::launch-status', self.__notify_launch_status_cb) - self.set_primary_text(glib.markup_escape_text(_('Starting...'))) + self.set_primary_text(GLib.markup_escape_text(_('Starting...'))) elif home_activity.props.launch_status == shell.Activity.LAUNCH_FAILED: self._on_failed_launch() else: @@ -60,7 +60,7 @@ class BasePalette(Palette): def _on_failed_launch(self): message = _('Activity failed to start') - self.set_primary_text(glib.markup_escape_text(message)) + self.set_primary_text(GLib.markup_escape_text(message)) def __notify_launch_status_cb(self, home_activity, pspec): home_activity.disconnect(self._notify_launch_hid) @@ -86,11 +86,11 @@ class CurrentActivityPalette(BasePalette): def setup_palette(self): activity_name = self._home_activity.get_activity_name() if activity_name: - self.props.primary_text = glib.markup_escape_text(activity_name) + self.props.primary_text = GLib.markup_escape_text(activity_name) title = self._home_activity.get_title() if title and title != activity_name: - self.props.secondary_text = glib.markup_escape_text(title) + self.props.secondary_text = GLib.markup_escape_text(title) self.menu_box = PaletteMenuBox() @@ -145,7 +145,7 @@ class ActivityPalette(Palette): icon_size=Gtk.IconSize.LARGE_TOOLBAR) name = activity_info.get_name() - Palette.__init__(self, primary_text=glib.markup_escape_text(name), + Palette.__init__(self, primary_text=GLib.markup_escape_text(name), icon=activity_icon) xo_color = XoColor('%s,%s' % (style.COLOR_WHITE.get_svg(), @@ -177,7 +177,7 @@ class JournalPalette(BasePalette): def setup_palette(self): title = self._home_activity.get_title() - self.set_primary_text(glib.markup_escape_text(title)) + self.set_primary_text(GLib.markup_escape_text(title)) box = PaletteMenuBox() self.set_content(box) @@ -234,7 +234,7 @@ class VolumePalette(Palette): self._mount = mount path = mount.get_root().get_path() - self.props.secondary_text = glib.markup_escape_text(path) + self.props.secondary_text = GLib.markup_escape_text(path) self.content_box = PaletteMenuBox() self.set_content(self.content_box) |