From fb904582e841076ae9517a1526268d95fc2a9c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Thu, 3 Sep 2009 19:19:07 +0200 Subject: Fix the segfault in GLib due to wrong encoding --- portato/gui/windows/basic.py | 1 + 1 file changed, 1 insertion(+) diff --git a/portato/gui/windows/basic.py b/portato/gui/windows/basic.py index b3f210c..3cedd69 100644 --- a/portato/gui/windows/basic.py +++ b/portato/gui/windows/basic.py @@ -31,6 +31,7 @@ except OSError: else: getlib.textdomain(APP) getlib.bindtextdomain(APP, LOCALE_DIR) + getlib.bind_textdomain_codeset(APP, "UTF-8") class WrappedTree (object): __slots__ = ("klass", "tree", "get_widget", "get_ui") -- cgit v1.2.3 From bc35d41079ffac6fa653d1705dc7776c392eff8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Thu, 8 Oct 2009 14:02:40 +0200 Subject: Enhance the splash window handling. Now the splash window is forced to stay on top. Hopes no users are going to complain ;). Additionally, the splash window is destroyed opposed to only hidden. As it is not reused, there is no use in keeping it alive. (cherry picked from commit 0a30d24e34493a2f56ba801facf4daba711d363e) --- portato/gui/__init__.py | 6 ++++-- portato/gui/windows/splash.py | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/portato/gui/__init__.py b/portato/gui/__init__.py index e3f1172..0a584a8 100644 --- a/portato/gui/__init__.py +++ b/portato/gui/__init__.py @@ -27,9 +27,11 @@ def run (): from .windows.main import MainWindow try: m = MainWindow(s) - s.hide() + s.destroy() + del s + m.main() except PreReqError, e: error("Prerequisite not matched. Aborting.") prereq_error_dialog(e) - s.hide() + s.destroy() diff --git a/portato/gui/windows/splash.py b/portato/gui/windows/splash.py index 39ba00d..c9e1542 100644 --- a/portato/gui/windows/splash.py +++ b/portato/gui/windows/splash.py @@ -40,6 +40,7 @@ class SplashScreen (Window): gtk.main_iteration() def show (self): + self.window.set_keep_above(True) self.window.show_all() self.do_iteration() @@ -47,4 +48,8 @@ class SplashScreen (Window): self.window.hide() self.do_iteration() + def destroy(self): + self.window.destroy() + self.do_iteration() + __call__ = set_descr -- cgit v1.2.3 From 1b1cc8e9cc9203a93c0d77981e56e79b5f7e1098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Wed, 28 Oct 2009 00:30:09 +0100 Subject: Corrected config path handling. Now also the 2.1 portage does not include / anymore. Handle this. (cherry picked from commit 58c5b49ae6d822f07879bf7f6a87271b77e7e75d) --- portato/backend/portage/system.py | 7 ++++++- portato/backend/portage/system_22.py | 8 -------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py index d7c7806..94553c6 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -68,7 +68,12 @@ class PortageSystem (SystemInterface): return PortagePackage(cpv) def get_config_path (self): - return portage.USER_CONFIG_PATH + path = portage.USER_CONFIG_PATH + + if path[0] != "/": + return os.path.join(self.settings.settings["ROOT"], path) + else: + return path def get_merge_command (self): return ["/usr/bin/python", "/usr/bin/emerge"] diff --git a/portato/backend/portage/system_22.py b/portato/backend/portage/system_22.py index f69e15c..d720a06 100644 --- a/portato/backend/portage/system_22.py +++ b/portato/backend/portage/system_22.py @@ -63,11 +63,3 @@ class PortageSystem_22 (PortageSystem): def new_package (self, cpv): return PortagePackage_22(cpv) - - def get_config_path (self): - path = PortageSystem.get_config_path(self) - - if path[0] != "/": - return os.path.join(self.settings.settings["ROOT"], path) - else: - return path -- cgit v1.2.3 From 447c074ef6361b8ee9061ac68481d73285f0896e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Wed, 28 Oct 2009 00:51:49 +0100 Subject: Changelog --- doc/Changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/Changelog b/doc/Changelog index e99a3ad..fe8799b 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +0.13.1: +- fix segfault in GLib +- correct config path handling for portage-2.1.7.x + 0.13: - allow lines w/o keyword in package.keywords - added support for ktsuss as su-frontend -- cgit v1.2.3