[gedit] Import glib instead of GLib.
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Import glib instead of GLib.
- Date: Thu, 20 Jan 2011 10:52:50 +0000 (UTC)
commit e273c13705be9b10a8d7a6793aec967a9ab33b07
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Thu Jan 20 11:52:22 2011 +0100
Import glib instead of GLib.
Dinamic bindings for GLib are crashy so it is highly recommended to use
the static ones. Also use GObject were possible as we were using some
methods in GLib that were also in GObject.
plugins/externaltools/tools/capture.py | 6 +++---
plugins/externaltools/tools/library.py | 6 +++---
plugins/quickopen/quickopen/__init__.py | 2 +-
plugins/quickopen/quickopen/popup.py | 4 ++--
plugins/snippets/snippets/__init__.py | 5 +++--
plugins/snippets/snippets/document.py | 9 ++++-----
plugins/snippets/snippets/placeholder.py | 10 +++++-----
7 files changed, 21 insertions(+), 21 deletions(-)
---
diff --git a/plugins/externaltools/tools/capture.py b/plugins/externaltools/tools/capture.py
index 390a87f..c513526 100644
--- a/plugins/externaltools/tools/capture.py
+++ b/plugins/externaltools/tools/capture.py
@@ -22,7 +22,7 @@ import os, sys, signal
import locale
import subprocess
import fcntl
-from gi.repository import GObject, GLib
+from gi.repository import GObject
class Capture(GObject.Object):
CAPTURE_STDOUT = 0x01
@@ -152,7 +152,7 @@ class Capture(GObject.Object):
return False
def on_output(self, source, condition):
- if condition & (GLib.IOCondition.IN | GLib.IOCondition.PRI):
+ if condition & (GObject.IO_IN | GObject.IO_PRI):
line = source.read()
if len(line) > 0:
@@ -178,7 +178,7 @@ class Capture(GObject.Object):
else:
self.emit('stderr-line', line)
- if condition & ~(GLib.IOCondition.IN | GLib.IOCondition.PRI):
+ if condition & ~(GObject.IO_IN | GObject.IO_PRI):
if self.read_buffer:
if source == self.pipe.stdout:
self.emit('stdout-line', self.read_buffer)
diff --git a/plugins/externaltools/tools/library.py b/plugins/externaltools/tools/library.py
index 1e4ef64..82ca83d 100644
--- a/plugins/externaltools/tools/library.py
+++ b/plugins/externaltools/tools/library.py
@@ -20,7 +20,7 @@ import os
import re
import locale
import platform
-from gi.repository import GLib
+import glib
class Singleton(object):
_instance = None
@@ -54,7 +54,7 @@ class ToolLibrary(Singleton):
if userdir:
toolsdir = os.path.join(userdir, 'gedit/tools')
else:
- toolsdir = os.path.join(GLib.get_user_config_dir(), 'gedit/tools')
+ toolsdir = os.path.join(glib.get_user_config_dir(), 'gedit/tools')
self.locations.insert(0, toolsdir);
@@ -83,7 +83,7 @@ class ToolLibrary(Singleton):
if userdir:
filename = os.path.join(userdir, 'gedit/gedit-tools.xml')
else:
- filename = os.path.join(GLib.get_user_config_dir(), 'gedit/gedit-tools.xml')
+ filename = os.path.join(glib.get_user_config_dir(), 'gedit/gedit-tools.xml')
if not os.path.isfile(filename):
return
diff --git a/plugins/quickopen/quickopen/__init__.py b/plugins/quickopen/quickopen/__init__.py
index b1edbd1..1ade33b 100644
--- a/plugins/quickopen/quickopen/__init__.py
+++ b/plugins/quickopen/quickopen/__init__.py
@@ -19,7 +19,7 @@
from popup import Popup
import os
-from gi.repository import GObject, Gio, GLib, Gtk, Gedit
+from gi.repository import GObject, Gio, Gtk, Gedit
from virtualdirs import RecentDocumentsDirectory
from virtualdirs import CurrentDocumentsDirectory
diff --git a/plugins/quickopen/quickopen/popup.py b/plugins/quickopen/quickopen/popup.py
index d64084f..974e490 100644
--- a/plugins/quickopen/quickopen/popup.py
+++ b/plugins/quickopen/quickopen/popup.py
@@ -19,7 +19,7 @@
import os
import fnmatch
-from gi.repository import Gio, GObject, Pango, Gtk, Gdk, GLib, Gedit
+from gi.repository import Gio, GObject, Pango, Gtk, Gdk, Gedit
import xml.sax.saxutils
from virtualdirs import VirtualDirectory
@@ -136,7 +136,7 @@ class Popup(Gtk.Dialog):
try:
entries = gfile.enumerate_children("standard::*", Gio.FileQueryInfoFlags.NONE, None)
- except GLib.Error:
+ except GObject.Error:
pass
children = []
diff --git a/plugins/snippets/snippets/__init__.py b/plugins/snippets/snippets/__init__.py
index 0f0c05c..f843b15 100644
--- a/plugins/snippets/snippets/__init__.py
+++ b/plugins/snippets/snippets/__init__.py
@@ -20,8 +20,9 @@ import os
import shutil
import cairo
+import glib
-from gi.repository import GLib, Gtk, Gdk, Gedit, PeasGtk, GObject
+from gi.repository import Gtk, Gdk, Gedit, PeasGtk, GObject
import platform
from library import Library
@@ -52,7 +53,7 @@ class AppActivatable(GObject.Object, Gedit.AppActivatable, PeasGtk.Configurable)
if userdir:
snippetsdir = os.path.join(userdir, 'gedit/snippets')
else:
- snippetsdir = os.path.join(GLib.get_user_config_dir(), 'gedit/snippets')
+ snippetsdir = os.path.join(glib.get_user_config_dir(), 'gedit/snippets')
library.set_dirs(snippetsdir, self.system_dirs())
diff --git a/plugins/snippets/snippets/document.py b/plugins/snippets/snippets/document.py
index 6f84e2c..d206749 100644
--- a/plugins/snippets/snippets/document.py
+++ b/plugins/snippets/snippets/document.py
@@ -19,8 +19,7 @@ import os
import re
import cairo
-from gi.repository import Gtk, Gdk, Gio, GLib, GtkSource, Gedit
-import glib
+from gi.repository import Gtk, Gdk, Gio, GtkSource, Gedit
from library import Library
from snippet import Snippet
@@ -63,7 +62,7 @@ class Document:
# to the view and the plugin instance, disconnect all signal handlers
def stop(self):
if self.timeout_update_id != 0:
- GLib.source_remove(self.timeout_update_id)
+ GObject.source_remove(self.timeout_update_id)
self.timeout_update_id = 0
del self.update_placeholders[:]
del self.jump_placeholders[:]
@@ -729,7 +728,7 @@ class Document:
self.jump_placeholders.append((self.active_placeholder, current))
if self.timeout_update_id == 0:
- self.timeout_update_id = glib.timeout_add(0,
+ self.timeout_update_id = GObject.timeout_add(0,
self.update_snippet_contents)
def on_buffer_changed(self, buf):
@@ -740,7 +739,7 @@ class Document:
self.update_placeholders.append(current)
if self.timeout_update_id == 0:
- self.timeout_update_id = glib.timeout_add(0, \
+ self.timeout_update_id = GObject.timeout_add(0, \
self.update_snippet_contents)
def on_buffer_insert_text(self, buf, piter, text, length):
diff --git a/plugins/snippets/snippets/placeholder.py b/plugins/snippets/snippets/placeholder.py
index d10eaeb..61727bd 100644
--- a/plugins/snippets/snippets/placeholder.py
+++ b/plugins/snippets/snippets/placeholder.py
@@ -323,12 +323,12 @@ class PlaceholderExpand(Placeholder):
def remove_timeout(self):
if self.timeout_id != None:
- GLib.source_remove(self.timeout_id)
+ GObject.source_remove(self.timeout_id)
self.timeout_id = None
def install_timeout(self):
self.remove_timeout()
- self.timeout_id = GLib.timeout_add(1000, self.timeout_cb)
+ self.timeout_id = GObject.timeout_add(1000, self.timeout_cb)
def timeout_cb(self):
self.timeout_id = None
@@ -398,7 +398,7 @@ class PlaceholderShell(PlaceholderExpand):
if not self.shell:
return False
- GLib.source_remove(self.watch_id)
+ GObject.source_remove(self.watch_id)
self.close_shell()
if self.remove_me:
@@ -452,7 +452,7 @@ class PlaceholderShell(PlaceholderExpand):
self.remove_timeout()
if self.shell:
- GLib.source_remove(self.watch_id)
+ GObject.source_remove(self.watch_id)
self.close_shell()
popen_args = {
@@ -465,7 +465,7 @@ class PlaceholderShell(PlaceholderExpand):
self.command = text
self.shell = subprocess.Popen(text, **popen_args)
self.shell_output = ''
- self.watch_id = GLib.io_add_watch(self.shell.stdout, GObject.IO_IN | \
+ self.watch_id = GObject.io_add_watch(self.shell.stdout, GObject.IO_IN | \
GObject.IO_HUP, self.process_cb)
self.install_timeout()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]