wingo - in flumotion/trunk: . flumotion/admin/gtk

[flumotion-commit at lists.fluendo.com]

Author: wingo
Date: Wed May  2 13:58:25 2007
New Revision: 4867

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/admin/gtk/client.py
   flumotion/trunk/flumotion/admin/gtk/dialogs.py
   flumotion/trunk/flumotion/admin/gtk/main.py
Log:
2007-05-02  Andy Wingo  <wingo at pobox.com>

	* flumotion/admin/gtk/main.py (startAdminFromGreeter.failed): 
	* flumotion/admin/gtk/dialogs.py (connection_failed_message): 
	* flumotion/admin/gtk/client.py
	(Window.on_open_connection.refused): Change interface to some of
	the dialogs.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed May  2 13:58:25 2007
@@ -1,5 +1,11 @@
 2007-05-02  Andy Wingo  <wingo at pobox.com>
 
+	* flumotion/admin/gtk/main.py (startAdminFromGreeter.failed): 
+	* flumotion/admin/gtk/dialogs.py (connection_failed_message): 
+	* flumotion/admin/gtk/client.py
+	(Window.on_open_connection.refused): Change interface to some of
+	the dialogs.
+
 	* flumotion/common/Makefile.am (flumotion_PYTHON): 
 	* flumotion/common/startset.py (StartSet): New data structure,
 	factored out of flumotion.worker.job.DeferredStartSet. Still need

Modified: flumotion/trunk/flumotion/admin/gtk/client.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/client.py	(original)
+++ flumotion/trunk/flumotion/admin/gtk/client.py	Wed May  2 13:58:25 2007
@@ -200,7 +200,7 @@
                 d = dialogs.connection_refused_message(i.host,
                                                        self.window)
             else:
-                d = dialogs.connection_failed_message(i.host,
+                d = dialogs.connection_failed_message(i, str(failure),
                                                       self.window)
             d.addCallback(lambda _: self.window.set_sensitive(True))
 

Modified: flumotion/trunk/flumotion/admin/gtk/dialogs.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/dialogs.py	(original)
+++ flumotion/trunk/flumotion/admin/gtk/dialogs.py	Wed May  2 13:58:25 2007
@@ -19,13 +19,15 @@
 
 # Headers in this file shall remain intact.
 
-from flumotion.common.pygobject import gsignal
-from flumotion.common import pygobject
-
+from gettext import gettext as _
 
 import gtk
 import gobject
 
+from flumotion.common.pygobject import gsignal
+from flumotion.common import pygobject
+
+
 class ProgressDialog(gtk.Dialog):
     def __init__(self, title, message, parent = None):
         gtk.Dialog.__init__(self, title, parent,
@@ -110,7 +112,9 @@
                     % host)
     return d.run()
 
-def connection_failed_message(message, parent=None):
+def connection_failed_message(info, debug, parent=None):
+    message = (_("Connection to manager on %s failed (%s).")
+               % (str(info), debug))
     d = ErrorDialog('Connection failed', parent, True, message)
     return d.run()
 

Modified: flumotion/trunk/flumotion/admin/gtk/main.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/main.py	(original)
+++ flumotion/trunk/flumotion/admin/gtk/main.py	Wed May  2 13:58:25 2007
@@ -42,6 +42,9 @@
     return greeter.Greeter()
 
 def startAdminFromGreeter(greeter):
+    # fuck python's lexicals!
+    _info = []
+
     def got_state(state):
         greeter.set_sensitive(False)
         authenticator = fpb.Authenticator(username=state['user'],
@@ -49,6 +52,7 @@
         info = connection.PBConnectionInfo(state['host'], state['port'],
                                            not state['use_insecure'],
                                            authenticator)
+        _info.append(info)
         model = AdminModel()
         return model.connectToManager(info)
 
@@ -62,7 +66,8 @@
     def failed(failure):
         failure.trap(errors.ConnectionFailedError)
         message = "".join(failure.value.args)
-        dret = dialogs.connection_failed_message(message, greeter.window)
+        dret = dialogs.connection_failed_message(info[0], message,
+                                                 greeter.window)
         dret.addCallback(lambda _: startAdminFromGreeter(greeter))
         return dret