diff options
| author | Philippe Normand <philn@igalia.com> | 2016-01-14 12:21:34 +0100 |
|---|---|---|
| committer | Stefan Sauer <ensonic@users.sf.net> | 2016-03-25 18:58:49 +0100 |
| commit | 66a6d948a6a92ca93df9d5fd44fde64674429bea (patch) | |
| tree | 6de2fe0e1b7b9b4b3e935a9fe98394b10eb38f54 /debug-viewer | |
| parent | ae13b162059c1fb3d58142f6031eb8059174c626 (diff) | |
debug-viewer: use the gi GLib version rather than the old gobject glib package
Diffstat (limited to 'debug-viewer')
| -rw-r--r-- | debug-viewer/GstDebugViewer/GUI/columns.py | 9 | ||||
| -rw-r--r-- | debug-viewer/GstDebugViewer/GUI/window.py | 6 | ||||
| -rw-r--r-- | debug-viewer/GstDebugViewer/Plugins/FindBar.py | 5 |
3 files changed, 9 insertions, 11 deletions
diff --git a/debug-viewer/GstDebugViewer/GUI/columns.py b/debug-viewer/GstDebugViewer/GUI/columns.py index d06b4c4f61..230db9356b 100644 --- a/debug-viewer/GstDebugViewer/GUI/columns.py +++ b/debug-viewer/GstDebugViewer/GUI/columns.py @@ -24,8 +24,7 @@ def _ (s): import logging -import glib -from gi.repository import Gtk +from gi.repository import Gtk, GLib from GstDebugViewer import Common, Data from GstDebugViewer.GUI.colors import LevelColorThemeTango @@ -347,13 +346,13 @@ class MessageColumn (TextColumn): end = None for start, end in ranges: if prev_end < start: - tags.append (glib.markup_escape_text (msg[prev_end:start])) - msg_escape = glib.markup_escape_text (msg[start:end]) + tags.append (GLib.markup_escape_text (msg[prev_end:start])) + msg_escape = GLib.markup_escape_text (msg[start:end]) tags.append ("<span foreground=\'#FFFFFF\'" " background=\'#0000FF\'>%s</span>" % (msg_escape,)) prev_end = end if end is not None: - tags.append (glib.markup_escape_text (msg[end:])) + tags.append (GLib.markup_escape_text (msg[end:])) cell.props.markup = "".join (tags) return message_data_func diff --git a/debug-viewer/GstDebugViewer/GUI/window.py b/debug-viewer/GstDebugViewer/GUI/window.py index 71599b38ca..7ee27e6eb7 100644 --- a/debug-viewer/GstDebugViewer/GUI/window.py +++ b/debug-viewer/GstDebugViewer/GUI/window.py @@ -28,10 +28,10 @@ import os.path from bisect import bisect_right, bisect_left import logging -import glib from gi.repository import GObject from gi.repository import Gtk from gi.repository import Gdk +from gi.repository import GLib from GstDebugViewer import Common, Data, Main from GstDebugViewer.GUI.columns import LineViewColumnManager, ViewColumnManager @@ -850,8 +850,8 @@ class Window (object): bar.props.message_type = Gtk.MessageType.ERROR box = bar.get_content_area () - markup = "<b>%s</b> %s" % (glib.markup_escape_text (message1), - glib.markup_escape_text (message2),) + markup = "<b>%s</b> %s" % (GLib.markup_escape_text (message1), + GLib.markup_escape_text (message2),) label = Gtk.Label () label.props.use_markup = True label.props.label = markup diff --git a/debug-viewer/GstDebugViewer/Plugins/FindBar.py b/debug-viewer/GstDebugViewer/Plugins/FindBar.py index 60a146b8f8..d6ae27c654 100644 --- a/debug-viewer/GstDebugViewer/Plugins/FindBar.py +++ b/debug-viewer/GstDebugViewer/Plugins/FindBar.py @@ -24,8 +24,7 @@ import logging from GstDebugViewer import Common, Data, GUI from GstDebugViewer.Plugins import * -import glib -from gi.repository import GObject +from gi.repository import GObject, GLib from gi.repository import Gtk class SearchOperation (object): @@ -183,7 +182,7 @@ class FindBarWidget (Gtk.HBox): def __set_status (self, text): - markup = "<b>%s</b>" % (glib.markup_escape_text (text),) + markup = "<b>%s</b>" % (GLib.markup_escape_text (text),) self.status_label.props.label = markup |