From 84e9542d2d174e353416c8691d055f6fe70b573f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 23 Jul 2008 18:22:35 +0200
Subject: [PATCH] Fix test on return value of request_server

---
 tryton/gui/main.py            | 5 +++--
 tryton/gui/window/dbcreate.py | 7 +++++--
 tryton/gui/window/dblogin.py  | 5 ++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tryton/gui/main.py b/tryton/gui/main.py
index 32e3b95e7a..23f8e443c0 100644
--- a/tryton/gui/main.py
+++ b/tryton/gui/main.py
@@ -781,9 +781,10 @@ class Main(object):
 
         def refreshlist_ask(widget, server_widget, db_widget, label,
                 parent=None):
-            host, port = common.request_server(server_widget, parent)
-            if not url:
+            res = common.request_server(server_widget, parent)
+            if not res:
                 return None
+            host, port = res
             refreshlist(widget, db_widget, label, host, port)
             return (host, port)
 
diff --git a/tryton/gui/window/dbcreate.py b/tryton/gui/window/dbcreate.py
index acf06ae5f2..09d3d40166 100644
--- a/tryton/gui/window/dbcreate.py
+++ b/tryton/gui/window/dbcreate.py
@@ -24,7 +24,10 @@ class DBCreate(object):
         return sensitive
 
     def server_change(self, widget, parent):
-        host, port = common.request_server(self.server_widget, parent)
+        res = common.request_server(self.server_widget, parent)
+        if not res:
+            return False
+        host, port = res
         try:
             if self.lang_widget and host and port:
                 common.refresh_langlist(self.lang_widget, host, port)
@@ -32,7 +35,7 @@ class DBCreate(object):
         except:
             self.set_sensitive(False)
             return False
-        return url
+        return True
 
     def __init__(self, sig_login):
         self.dialog = glade.XML(GLADE, "win_createdb", gettext.textdomain())
diff --git a/tryton/gui/window/dblogin.py b/tryton/gui/window/dblogin.py
index 2c613a9ed5..41fa3ac6c6 100644
--- a/tryton/gui/window/dblogin.py
+++ b/tryton/gui/window/dblogin.py
@@ -122,7 +122,10 @@ class DBLogin(object):
     @staticmethod
     def refreshlist_ask(widget, server_widget, db_widget, label,
             butconnect=False, host=False, port=0, parent=None):
-        host, port = common.request_server(server_widget, parent) or (host, port)
+        res = common.request_server(server_widget, parent) or (host, port)
+        if not res:
+            return False
+        host, port = res
         return DBLogin.refreshlist(widget, db_widget, label, host, port,
                 butconnect)