diff options
Diffstat (limited to 'src/jarabe/desktop')
| -rw-r--r-- | src/jarabe/desktop/activitieslist.py | 4 | ||||
| -rw-r--r-- | src/jarabe/desktop/favoritesview.py | 4 | ||||
| -rw-r--r-- | src/jarabe/desktop/meshbox.py | 6 | ||||
| -rw-r--r-- | src/jarabe/desktop/networkviews.py | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/jarabe/desktop/activitieslist.py b/src/jarabe/desktop/activitieslist.py index 603cae2..6594ee9 100644 --- a/src/jarabe/desktop/activitieslist.py +++ b/src/jarabe/desktop/activitieslist.py @@ -19,7 +19,7 @@ import os import logging from gettext import gettext as _ -import glib +from gi.repository import GLib from gi.repository import GObject from gi.repository import Pango from gi.repository import GConf @@ -333,7 +333,7 @@ class ClearMessageBox(Gtk.EventBox): label = Gtk.Label() color = style.COLOR_BUTTON_GREY.get_html() label.set_markup('<span weight="bold" color="%s">%s</span>' % ( \ - color, glib.markup_escape_text(message))) + color, GLib.markup_escape_text(message))) box.pack_start(label, expand=True, fill=False, padding=0) label.show() diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py index 76ab196..69f8ea3 100644 --- a/src/jarabe/desktop/favoritesview.py +++ b/src/jarabe/desktop/favoritesview.py @@ -21,7 +21,7 @@ import math from gi.repository import GObject from gi.repository import GConf -import glib +from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -537,7 +537,7 @@ class FavoritePalette(ActivityPalette): if journal_entries: title = journal_entries[0]['title'] - self.props.secondary_text = glib.markup_escape_text(title) + self.props.secondary_text = GLib.markup_escape_text(title) menu_items = [] for entry in journal_entries: diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index e1db864..b79dd02 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -21,7 +21,7 @@ from gettext import gettext as _ import logging import dbus -import glib +from gi.repository import GLib from gi.repository import GObject from gi.repository import Gtk from gi.repository import GConf @@ -62,8 +62,8 @@ class _ActivityIcon(CanvasIcon): self.__button_release_event_cb) def create_palette(self): - primary_text = glib.markup_escape_text(self._model.bundle.get_name()) - secondary_text = glib.markup_escape_text(self._model.get_name()) + primary_text = GLib.markup_escape_text(self._model.bundle.get_name()) + secondary_text = GLib.markup_escape_text(self._model.get_name()) palette_icon = Icon(file=self._model.bundle.get_icon(), xo_color=self._model.get_color()) palette_icon.props.icon_size = Gtk.IconSize.LARGE_TOOLBAR diff --git a/src/jarabe/desktop/networkviews.py b/src/jarabe/desktop/networkviews.py index dce06e4..63e860d 100644 --- a/src/jarabe/desktop/networkviews.py +++ b/src/jarabe/desktop/networkviews.py @@ -22,7 +22,7 @@ import hashlib import uuid import dbus -import glib +from gi.repository import GLib from gi.repository import Gtk @@ -123,7 +123,7 @@ class WirelessNetworkView(EventPulsingIcon): icon_size=style.STANDARD_ICON_SIZE, badge_name=self.props.badge_name) - label = glib.markup_escape_text(self._display_name) + label = GLib.markup_escape_text(self._display_name) p = palette.Palette(primary_text=label, icon=self._palette_icon) self.menu_box = Gtk.VBox() @@ -495,7 +495,7 @@ class SugarAdhocView(EventPulsingIcon): icon_size=style.STANDARD_ICON_SIZE) text = _('Ad-hoc Network %d') % (self._channel, ) - palette_ = palette.Palette(glib.markup_escape_text(text), + palette_ = palette.Palette(GLib.markup_escape_text(text), icon=self._palette_icon) self.menu_box = Gtk.VBox() @@ -635,7 +635,7 @@ class OlpcMeshView(EventPulsingIcon): def _create_palette(self): text = _('Mesh Network %d') % (self._channel, ) - _palette = palette.Palette(glib.markup_escape_text(text)) + _palette = palette.Palette(GLib.markup_escape_text(text)) self.menu_box = Gtk.VBox() |