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

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Wed Dec  5 15:20:43 2007
New Revision: 5992

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/admin/gtk/main.py
Log:
2007-12-05  Johan Dahlin  <johan at gnome.org>

	* flumotion/admin/gtk/main.py (failure): 
	Trap WizardCancelled here.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Dec  5 15:20:43 2007
@@ -1,3 +1,8 @@
+2007-12-05  Johan Dahlin  <johan at gnome.org>
+
+	* flumotion/admin/gtk/main.py (failure): 
+	Trap WizardCancelled here.
+
 2007-12-05  Pedro Gracia  <pedro at flumotion.com>
 
 	* po/es.po:

Modified: flumotion/trunk/flumotion/admin/gtk/main.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/main.py	(original)
+++ flumotion/trunk/flumotion/admin/gtk/main.py	Wed Dec  5 15:20:43 2007
@@ -130,6 +130,12 @@
         win.setAdminModel(admin)
         win.show()
 
+    def cancel(failure):
+        # Cancelled interactively, just quit
+        from flumotion.ui.simplewizard import WizardCancelled
+        failure.trap(WizardCancelled)
+        reactor.stop()
+
     def failure(failure):
         message = "".join(failure.value.args)
         log.warning('admin', "Failed to connect: %s",
@@ -137,6 +143,6 @@
         sys.stderr.write("Connection to manager failed: %s\n" % message)
         reactor.stop()
 
-    d.addCallbacks(adminStarted, failure)
+    d.addCallbacks(adminStarted, cancel, failure)
 
     reactor.run()