diff options
| -rw-r--r-- | doc/Changelog | 2 | ||||
| -rw-r--r-- | doc/TODO | 2 | ||||
| -rw-r--r-- | portato/backend/catapult/package.py | 12 | ||||
| -rw-r--r-- | portato/gui/gtk/windows.py | 35 |
4 files changed, 21 insertions, 30 deletions
diff --git a/doc/Changelog b/doc/Changelog index b14c2d3..5184423 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,4 +1,4 @@ -next: +0.8.6: - "porting" to python-2.5 - adding support for the "--with-bdeps=y" option in EMERGE_DEFAULT_OPTS - fix update world @@ -20,6 +20,8 @@ Backend: - "nach hause telefonieren" :) +- move resume_loop and shutdown plugins into main code + GUI: ==== diff --git a/portato/backend/catapult/package.py b/portato/backend/catapult/package.py index 32ea379..b5f3539 100644 --- a/portato/backend/catapult/package.py +++ b/portato/backend/catapult/package.py @@ -25,14 +25,10 @@ from gettext import lgettext as _ class CatapultPackage(Package): - def __init__ (self, cpv): - Package.__init__(self, cpv) - - self.bus = dbus.SessionBus() - # get the system - po = self.bus.get_object("org.gentoo.catapult.portage", "/org/gentoo/catapult/Package") - self.proxy = dbus.Interface(po, "org.gentoo.catapult.Package") - + bus = dbus.SessionBus() + dbus_object = bus.get_object("org.gentoo.catapult.portage", "/org/gentoo/catapult/Package") + proxy = dbus.Interface(dbus_object, "org.gentoo.catapult.Package") + def use_expanded (self, flag, suggest = None): if not suggest: suggest = "" diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py index 456d962..e3bf133 100644 --- a/portato/gui/gtk/windows.py +++ b/portato/gui/gtk/windows.py @@ -15,10 +15,7 @@ from __future__ import absolute_import # gtk stuff import gtk import gobject -try: - import gtksourceview2 -except ImportError: - gtksourceview2 = None +import gtksourceview2 # other import types, logging @@ -385,23 +382,19 @@ class EbuildWindow (AbstractDialog): def _build_view(self): """Creates the buffer and the view.""" - if gtksourceview2 is None: - self.buf = gtk.TextBuffer() - self.view = gtk.TextView(self.buf) - else: - man = gtksourceview2.LanguageManager() - man.set_search_path(man.get_search_path()+[DATA_DIR]) - language = man.get_language("ebuild") - - if language is None: - warning(_("No ebuild language file installed. Falling back to shell.")) - language = man.get_language("sh") - - # set buffer and view - self.buf = gtksourceview2.Buffer() - self.buf.set_language(language) - #self.buf.set_highlight(True) - self.view = gtksourceview2.View(self.buf) + man = gtksourceview2.LanguageManager() + man.set_search_path(man.get_search_path()+[DATA_DIR]) + language = man.get_language("ebuild") + + if language is None: + warning(_("No ebuild language file installed. Falling back to shell.")) + language = man.get_language("sh") + + # set buffer and view + self.buf = gtksourceview2.Buffer() + self.buf.set_language(language) + #self.buf.set_highlight(True) + self.view = gtksourceview2.View(self.buf) def _show (self): """Fill the buffer with content and shows the window.""" |