Merge branch 'master' of git.sugarlabs.org:sugar/mainline

21 files changed, 86 insertions, 94 deletions

diff --git a/configure.ac b/configure.ac
index 22e3196..04d17f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.97.11],[],[sugar])
+AC_INIT([Sugar],[0.97.12],[],[sugar])
 
 AC_PREREQ([2.59])
 
diff --git a/extensions/cpsection/language/view.py b/extensions/cpsection/language/view.py
index 95066f8..77f7207 100644
--- a/extensions/cpsection/language/view.py
+++ b/extensions/cpsection/language/view.py
@@ -136,8 +136,6 @@ class Language(SectionView):
             previous_add_removes = self._add_remove_boxes[-2]
             previous_add_removes.hide()
 
-        self._determine_add_remove_visibility()
-
         combobox.show()
 
     def _attach_to_table(self, widget, row, column, padding=20, \
@@ -216,8 +214,6 @@ class Language(SectionView):
         selected_langs = self._get_selected_langs()
         last_lang = selected_langs[-1]
 
-        self._determine_add_remove_visibility(last_lang=last_lang)
-
         self._changed = (selected_langs != self._selected_locales)
 
         if self._changed == False:
@@ -247,29 +243,6 @@ class Language(SectionView):
 
         return new_codes
 
-    def _determine_add_remove_visibility(self, last_lang=None):
-        # We should not let users add fallback languages for English (USA)
-        # This is because the software is not usually _translated_ into English
-        # which means that the fallback gets selected automatically
-
-        if last_lang is None:
-            selected_langs = self._get_selected_langs()
-            last_lang = selected_langs[-1]
-
-        add_remove_box = self._add_remove_boxes[-1]
-        buttons = add_remove_box.get_children()
-        add_button, remove_button = buttons
-
-        if last_lang.startswith('en_US'):
-            add_button.props.visible = False
-        else:
-            add_button.props.visible = True
-
-        if self._selected_lang_count == 1:
-            remove_button.props.visible = False
-        else:
-            remove_button.props.visible = True
-
     def __lang_timeout_cb(self, codes):
         self._lang_sid = 0
         self._model.set_languages_list(codes)
diff --git a/extensions/deviceicon/battery.py b/extensions/deviceicon/battery.py
index d95c057..21dc5f3 100644
--- a/extensions/deviceicon/battery.py
+++ b/extensions/deviceicon/battery.py
@@ -18,7 +18,7 @@ import logging
 from gettext import gettext as _
 
 from gi.repository import GConf
-import glib
+from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import Gtk
 import dbus
@@ -68,7 +68,7 @@ class DeviceView(TrayIcon):
         self.set_palette_invoker(FrameWidgetInvoker(self))
 
         self._model = DeviceModel(battery)
-        self.palette = BatteryPalette(glib.markup_escape_text(_('My Battery')))
+        self.palette = BatteryPalette(GLib.markup_escape_text(_('My Battery')))
         self.palette.set_group_id('frame')
         self.palette_invoker.props.toggle_palette = True
         self._model.connect('updated',
@@ -170,7 +170,7 @@ class BatteryPalette(Palette):
 
         self.set_content(progress_widget)
 
-        self.props.secondary_text = glib.markup_escape_text(secondary_text)
+        self.props.secondary_text = GLib.markup_escape_text(secondary_text)
         self._status_label.set_text(status_text)
 
 
diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py
index fbd0ef4..ebbafdd 100644
--- a/extensions/deviceicon/network.py
+++ b/extensions/deviceicon/network.py
@@ -26,7 +26,7 @@ import struct
 import datetime
 import time
 from gi.repository import Gtk
-import glib
+from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import GConf
 import dbus
@@ -105,12 +105,12 @@ class WirelessPalette(Palette):
         self._info.show_all()
 
     def set_connecting(self):
-        label = glib.markup_escape_text(_('Connecting...'))
+        label = GLib.markup_escape_text(_('Connecting...'))
         self.props.secondary_text = label
 
     def _set_connected(self, iaddress):
         self.set_content(self._info)
-        self.props.secondary_text = glib.markup_escape_text(_('Connected'))
+        self.props.secondary_text = GLib.markup_escape_text(_('Connected'))
         self._set_ip_address(iaddress)
         self._disconnect_item.show()
 
@@ -123,7 +123,7 @@ class WirelessPalette(Palette):
         self._set_channel(channel)
 
     def set_disconnected(self):
-        label = glib.markup_escape_text(_('No wireless connection'))
+        label = GLib.markup_escape_text(_('No wireless connection'))
         self.props.primary_text = label
         self.props.secondary_text = ''
         self._disconnect_item.hide()
@@ -152,7 +152,7 @@ class WiredPalette(Palette):
     __gtype_name__ = 'SugarWiredPalette'
 
     def __init__(self):
-        label = glib.markup_escape_text(_('Wired Network'))
+        label = GLib.markup_escape_text(_('Wired Network'))
         Palette.__init__(self, primary_text=label)
 
         self._speed_label = Gtk.Label()
@@ -178,7 +178,7 @@ class WiredPalette(Palette):
         self._info.show_all()
 
         self.set_content(self._info)
-        self.props.secondary_text = glib.markup_escape_text(_('Connected'))
+        self.props.secondary_text = GLib.markup_escape_text(_('Connected'))
 
     def set_connected(self, speed, iaddress):
         self._speed_label.set_text('%s: %d Mb/s' % (_('Speed'), speed))
@@ -206,7 +206,7 @@ class GsmPalette(Palette):
     }
 
     def __init__(self):
-        label = glib.markup_escape_text(_('Wireless modem'))
+        label = GLib.markup_escape_text(_('Wireless modem'))
         Palette.__init__(self, primary_text=label)
 
         self._current_state = None
@@ -274,13 +274,13 @@ class GsmPalette(Palette):
     def _update_label_and_text(self, reason=0):
         if self._current_state == _GSM_STATE_NOT_READY:
             self._toggle_state_item.set_label('...')
-            label = glib.markup_escape_text(_('Please wait...'))
+            label = GLib.markup_escape_text(_('Please wait...'))
             self.props.secondary_text = label
 
         elif self._current_state == _GSM_STATE_DISCONNECTED:
             if not self._failed_connection:
                 self._toggle_state_item.set_label(_('Connect'))
-            label = glib.markup_escape_text(_('Disconnected'))
+            label = GLib.markup_escape_text(_('Disconnected'))
             self.props.secondary_text = label
             icon = Icon(icon_name='dialog-ok', \
                             icon_size=Gtk.IconSize.MENU)
@@ -288,7 +288,7 @@ class GsmPalette(Palette):
 
         elif self._current_state == _GSM_STATE_CONNECTING:
             self._toggle_state_item.set_label(_('Cancel'))
-            label = glib.markup_escape_text(_('Connecting...'))
+            label = GLib.markup_escape_text(_('Connecting...'))
             self.props.secondary_text = label
             icon = Icon(icon_name='dialog-cancel', \
                             icon_size=Gtk.IconSize.MENU)
@@ -343,7 +343,7 @@ class GsmPalette(Palette):
         else:
             formatted_time = '00:00:00'
         text = _('Connected for %s') % (formatted_time, )
-        self.props.secondary_text = glib.markup_escape_text(text)
+        self.props.secondary_text = GLib.markup_escape_text(text)
 
     def update_stats(self, in_bytes, out_bytes):
         in_KBytes = in_bytes / 1024
@@ -521,7 +521,7 @@ class WirelessDeviceView(ToolButton):
         else:
             self._icon.props.badge_name = None
 
-        label = glib.markup_escape_text(self._display_name)
+        label = GLib.markup_escape_text(self._display_name)
         self._palette.props.primary_text = label
 
         self._update_state()
@@ -609,7 +609,7 @@ class OlpcMeshDeviceView(ToolButton):
         self.palette_invoker.props.toggle_palette = True
 
         title = _('Mesh Network')
-        self._palette = WirelessPalette(glib.markup_escape_text(title))
+        self._palette = WirelessPalette(GLib.markup_escape_text(title))
         self._palette.connect('deactivate-connection',
                               self.__deactivate_connection)
         self.set_palette(self._palette)
@@ -652,7 +652,7 @@ class OlpcMeshDeviceView(ToolButton):
 
     def _update_text(self):
         channel = str(self._channel)
-        text = glib.markup_escape_text(_('Mesh Network %s') % (channel, ))
+        text = GLib.markup_escape_text(_('Mesh Network %s') % (channel, ))
         self._palette.props.primary_text = text
 
     def _update(self):
diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py
index 51efe1f..c541675 100644
--- a/extensions/deviceicon/speaker.py
+++ b/extensions/deviceicon/speaker.py
@@ -17,7 +17,7 @@
 from gettext import gettext as _
 from gi.repository import GConf
 
-import glib
+from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import Gtk
 
@@ -58,7 +58,7 @@ class DeviceView(TrayIcon):
         self._update_info()
 
     def create_palette(self):
-        label = glib.markup_escape_text(_('My Speakers'))
+        label = GLib.markup_escape_text(_('My Speakers'))
         palette = SpeakerPalette(label, model=self._model)
         palette.set_group_id('frame')
         return palette
diff --git a/extensions/deviceicon/speech.py b/extensions/deviceicon/speech.py
index a0a2ad1..79b50a6 100644
--- a/extensions/deviceicon/speech.py
+++ b/extensions/deviceicon/speech.py
@@ -16,7 +16,7 @@
 
 from gettext import gettext as _
 
-import glib
+from gi.repository import GLib
 from gi.repository import Gtk
 from gi.repository import GConf
 from gi.repository import GObject
@@ -51,7 +51,7 @@ class SpeechDeviceView(TrayIcon):
         self._manager = speech.get_speech_manager()
 
     def create_palette(self):
-        label = glib.markup_escape_text(_('Speech'))
+        label = GLib.markup_escape_text(_('Speech'))
         palette = SpeechPalette(label, manager=self._manager)
         palette.set_group_id('frame')
         return palette
diff --git a/extensions/deviceicon/touchpad.py b/extensions/deviceicon/touchpad.py
index 1463be8..25900f2 100644
--- a/extensions/deviceicon/touchpad.py
+++ b/extensions/deviceicon/touchpad.py
@@ -20,7 +20,7 @@ import os
 
 from gi.repository import Gtk
 from gi.repository import GConf
-import glib
+from gi.repository import GLib
 
 import logging
 
@@ -61,7 +61,7 @@ class DeviceView(TrayIcon):
     def create_palette(self):
         """ Create a palette for this icon; called by the Sugar framework
         when a palette needs to be displayed. """
-        label = glib.markup_escape_text(_('My touchpad'))
+        label = GLib.markup_escape_text(_('My touchpad'))
         self.palette = ResourcePalette(label, self.icon)
         self.palette.set_group_id('frame')
         return self.palette
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()
 
diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py
index f8e15c9..ddf395f 100644
--- a/src/jarabe/frame/activitiestray.py
+++ b/src/jarabe/frame/activitiestray.py
@@ -24,7 +24,7 @@ import os
 from gi.repository import GObject
 from gi.repository import GConf
 from gi.repository import Gio
-import glib
+from gi.repository import GLib
 from gi.repository import Gtk
 
 from sugar3.graphics import style
@@ -203,7 +203,7 @@ class InvitePalette(Palette):
         else:
             name = bundle_id
 
-        self.set_primary_text(glib.markup_escape_text(name))
+        self.set_primary_text(GLib.markup_escape_text(name))
 
     def __join_activate_cb(self, menu_item):
         self._invite.join()
@@ -500,7 +500,7 @@ class BaseTransferPalette(Palette):
     }
 
     def __init__(self, file_transfer):
-        Palette.__init__(self, glib.markup_escape_text(file_transfer.title))
+        Palette.__init__(self, GLib.markup_escape_text(file_transfer.title))
 
         self.file_transfer = file_transfer
 
@@ -564,7 +564,7 @@ class IncomingTransferPalette(BaseTransferPalette):
         self.file_transfer.connect('notify::state', self.__notify_state_cb)
 
         nick = str(self.file_transfer.buddy.props.nick)
-        label = glib.markup_escape_text(_('Transfer from %s') % (nick,))
+        label = GLib.markup_escape_text(_('Transfer from %s') % (nick,))
         self.props.secondary_text = label
 
         self._update()
@@ -697,7 +697,7 @@ class OutgoingTransferPalette(BaseTransferPalette):
         self.file_transfer.connect('notify::state', self.__notify_state_cb)
 
         nick = str(file_transfer.buddy.props.nick)
-        label = glib.markup_escape_text(_('Transfer to %s') % (nick,))
+        label = GLib.markup_escape_text(_('Transfer to %s') % (nick,))
         self.props.secondary_text = label
 
         self._update()
diff --git a/src/jarabe/frame/clipboardmenu.py b/src/jarabe/frame/clipboardmenu.py
index c070189..e5f687a 100644
--- a/src/jarabe/frame/clipboardmenu.py
+++ b/src/jarabe/frame/clipboardmenu.py
@@ -20,7 +20,7 @@ import urlparse
 import os
 import logging
 from gi.repository import GConf
-import glib
+from gi.repository import GLib
 
 from gi.repository import Gtk
 
@@ -164,10 +164,10 @@ class ClipboardMenu(Palette):
 
     def _update(self):
         name = self._cb_object.get_name()
-        self.props.primary_text = glib.markup_escape_text(name)
+        self.props.primary_text = GLib.markup_escape_text(name)
         preview = self._cb_object.get_preview()
         if preview:
-            self.props.secondary_text = glib.markup_escape_text(preview)
+            self.props.secondary_text = GLib.markup_escape_text(preview)
         self._update_progress_bar()
         self._update_items_visibility()
         self._update_open_submenu()
diff --git a/src/jarabe/frame/zoomtoolbar.py b/src/jarabe/frame/zoomtoolbar.py
index befca5c..3360e24 100644
--- a/src/jarabe/frame/zoomtoolbar.py
+++ b/src/jarabe/frame/zoomtoolbar.py
@@ -18,7 +18,7 @@
 from gettext import gettext as _
 import logging
 
-import glib
+from gi.repository import GLib
 from gi.repository import Gtk
 from gi.repository import GObject
 
@@ -69,7 +69,7 @@ class ZoomToolbar(Gtk.Toolbar):
         self.add(button)
         button.show()
 
-        palette = Palette(glib.markup_escape_text(label))
+        palette = Palette(GLib.markup_escape_text(label))
         palette.props.invoker = FrameWidgetInvoker(button)
         palette.set_group_id('frame')
         button.set_palette(palette)
diff --git a/src/jarabe/journal/expandedentry.py b/src/jarabe/journal/expandedentry.py
index 439e19e..f2d8136 100644
--- a/src/jarabe/journal/expandedentry.py
+++ b/src/jarabe/journal/expandedentry.py
@@ -22,7 +22,7 @@ import os
 
 import cairo
 from gi.repository import GObject
-import glib
+from gi.repository import GLib
 from gi.repository import Gtk
 from gi.repository import Gdk
 import simplejson
@@ -370,7 +370,7 @@ class ExpandedEntry(Gtk.EventBox):
         old_title = self._metadata.get('title', None)
         new_title = self._title.get_text()
         if old_title != new_title:
-            label = glib.markup_escape_text(new_title)
+            label = GLib.markup_escape_text(new_title)
             self._icon.palette.props.primary_text = label
             self._metadata['title'] = new_title
             self._metadata['title_set_by_user'] = '1'
diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
index 09d8a31..527c11d 100644
--- a/src/jarabe/journal/journaltoolbox.py
+++ b/src/jarabe/journal/journaltoolbox.py
@@ -24,7 +24,6 @@ import time
 
 from gi.repository import GObject
 from gi.repository import Gio
-import glib
 from gi.repository import Gtk
 
 from sugar3.graphics.palette import Palette
@@ -470,6 +469,16 @@ class DetailToolbox(ToolbarBox):
             palette.menu.append(journal_menu)
             journal_menu.show()
 
+        documents_path = model.get_documents_path()
+        if not self._metadata['uid'].startswith(documents_path):
+            documents_menu = VolumeMenu(self._metadata, _('Documents'),
+                                        documents_path)
+            documents_menu.set_image(Icon(icon_name='user-documents',
+                                          icon_size=Gtk.IconSize.MENU))
+            documents_menu.connect('volume-error', self.__volume_error_cb)
+            palette.menu.append(documents_menu)
+            documents_menu.show()
+
         volume_monitor = Gio.VolumeMonitor.get()
         icon_theme = Gtk.IconTheme.get_default()
         for mount in volume_monitor.get_mounts():
diff --git a/src/jarabe/journal/listview.py b/src/jarabe/journal/listview.py
index 4af6e3c..61b4721 100644
--- a/src/jarabe/journal/listview.py
+++ b/src/jarabe/journal/listview.py
@@ -18,7 +18,7 @@ import logging
 from gettext import gettext as _
 import time
 
-import glib
+from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import Gdk
@@ -400,7 +400,7 @@ class BaseListView(Gtk.Bin):
         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)
 
         if show_clear_query:
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 43f9905..87f4a86 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -22,7 +22,7 @@ from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import GConf
 from gi.repository import Gio
-import glib
+from gi.repository import GLib
 
 from sugar3.graphics import style
 from sugar3.graphics.palette import Palette
@@ -63,7 +63,7 @@ class ObjectPalette(Palette):
         if 'title' in metadata:
             title = GObject.markup_escape_text(metadata['title'])
         else:
-            title = glib.markup_escape_text(_('Untitled'))
+            title = GLib.markup_escape_text(_('Untitled'))
 
         Palette.__init__(self, primary_text=title,
                          icon=activity_icon)
@@ -223,6 +223,16 @@ class CopyMenu(Gtk.Menu):
             self.append(journal_menu)
             journal_menu.show()
 
+        documents_path = model.get_documents_path()
+        if not self._metadata['uid'].startswith(documents_path):
+            documents_menu = VolumeMenu(self._metadata, _('Documents'),
+                                        documents_path)
+            documents_menu.set_image(Icon(icon_name='user-documents',
+                                          icon_size=Gtk.IconSize.MENU))
+            documents_menu.connect('volume-error', self.__volume_error_cb)
+            self.append(documents_menu)
+            documents_menu.show()
+
         volume_monitor = Gio.VolumeMonitor.get()
         icon_theme = Gtk.IconTheme.get_default()
         for mount in volume_monitor.get_mounts():
@@ -397,7 +407,7 @@ class BuddyPalette(Palette):
                           icon_size=style.STANDARD_ICON_SIZE,
                           xo_color=XoColor(colors))
 
-        Palette.__init__(self, primary_text=glib.markup_escape_text(nick),
+        Palette.__init__(self, primary_text=GLib.markup_escape_text(nick),
                          icon=buddy_icon)
 
         # TODO: Support actions on buddies, like make friend, invite, etc.
diff --git a/src/jarabe/journal/volumestoolbar.py b/src/jarabe/journal/volumestoolbar.py
index 1fc368e..e1e6331 100644
--- a/src/jarabe/journal/volumestoolbar.py
+++ b/src/jarabe/journal/volumestoolbar.py
@@ -21,7 +21,7 @@ from gettext import gettext as _
 
 from gi.repository import GObject
 from gi.repository import Gio
-import glib
+from gi.repository import GLib
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GConf
@@ -207,7 +207,7 @@ class VolumesToolbar(Gtk.Toolbar):
         if documents_path is not None:
             button = DocumentsButton(documents_path)
             button.props.group = self._volume_buttons[0]
-            label = glib.markup_escape_text(_('Documents'))
+            label = GLib.markup_escape_text(_('Documents'))
             button.set_palette(Palette(label))
             button.connect('toggled', self._button_toggled_cb)
             button.show()
@@ -359,7 +359,7 @@ class JournalButton(BaseButton):
 class JournalButtonPalette(Palette):
 
     def __init__(self, mount):
-        Palette.__init__(self, glib.markup_escape_text(_('Journal')))
+        Palette.__init__(self, GLib.markup_escape_text(_('Journal')))
         vbox = Gtk.VBox()
         self.set_content(vbox)
         vbox.show()
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)