From 06d2d8ecd2c530d480d6d9d3baa781fc5cfcef11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 1 Mar 2011 21:40:22 +0100 Subject: [PATCH 1/3] Remove trailing space --- tryton/gui/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tryton/gui/main.py b/tryton/gui/main.py index 88be500f40..cddeed7793 100644 --- a/tryton/gui/main.py +++ b/tryton/gui/main.py @@ -1347,9 +1347,9 @@ class Main(object): self._width = int(event.width) self._height = int(event.height) return False - + def sig_window_state(self, widget, event): - CONFIG['client.maximize'] = (event.new_window_state == + CONFIG['client.maximize'] = (event.new_window_state == gtk.gdk.WINDOW_STATE_MAXIMIZED) return False From aba87bcb6ecadf84532405a8cf52907f47cc49d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 2 Mar 2011 11:33:09 +0100 Subject: [PATCH 2/3] Add missing return value test of sig_logout in sig_login for issue1882 --- tryton/gui/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tryton/gui/main.py b/tryton/gui/main.py index cddeed7793..4bb40f11aa 100644 --- a/tryton/gui/main.py +++ b/tryton/gui/main.py @@ -1141,7 +1141,8 @@ class Main(object): return ([], []) def sig_login(self, widget=None, dbname=False, res=None): - self.sig_logout(widget, disconnect=False) + if not self.sig_logout(widget, disconnect=False): + return if not res: try: dblogin = DBLogin(self.window) From 589cf8882dc9d20a15fbd53213070d390ef639a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 2 Mar 2011 12:06:34 +0100 Subject: [PATCH 3/3] Catch select.error for SIGTERM on OpenBSD --- tryton/ipc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tryton/ipc.py b/tryton/ipc.py index 85d0cae441..3f28f198a2 100644 --- a/tryton/ipc.py +++ b/tryton/ipc.py @@ -113,7 +113,10 @@ class FIFOServer(IPCServer): fifo = os.fdopen(os.open(self.filename, os.O_RDONLY|os.O_NONBLOCK)) data = '' while self.running: - rlist, _, _ = select.select([fifo], [], [], 1) + try: + rlist, _, _ = select.select([fifo], [], [], 1) + except select.error: + continue if rlist: try: data += fifo.readline()