Replace remaining uses of "import glib"

This was not handled by the pygi-convert.sh script.

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>

5 files changed, 23 insertions, 23 deletions

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