Merge lp:~nataliabidart/ubuntu-sso-client/send-signal-on-close into lp:ubuntu-sso-client

[Natalia Bidart]

* User-cancelation signal is sent when the window is close and no other event was generated (LP: #627419).

User-cancelation signal is sent when the window is close and no other event was generated (LP: #627419).

[John Lenton (chipaca)]

review: Approve

[Rodrigo Moya (rodrigo-moya)]

review: Approve

=== modified file 'ubuntu_sso/gui.py'
--- ubuntu_sso/gui.py	2010-08-30 17:59:00 +0000
+++ ubuntu_sso/gui.py	2010-08-31 14:41:02 +0000
@@ -681,6 +681,8 @@
             signal = self._gtk_signal_log[-1][0]
             args = self._gtk_signal_log[-1][1:]
             self.window.emit(signal, *args)
+        else:
+            self.window.emit(SIG_USER_CANCELATION, self.app_name)
 
         # call user defined callback
         if self.close_callback is not None:

=== modified file 'ubuntu_sso/tests/test_gui.py'
--- ubuntu_sso/tests/test_gui.py	2010-08-30 17:59:00 +0000
+++ ubuntu_sso/tests/test_gui.py	2010-08-31 14:41:02 +0000
@@ -1816,6 +1816,12 @@
         """Keep trace of signals emition."""
         self._called[args[-1]] = (widget, args[:-1], kwargs)
 
+    def test_closing_main_window_sends_outcome_as_signal(self):
+        """A signal is sent when closing the main window."""
+        self.ui.window.emit('delete-event', gtk.gdk.Event(gtk.gdk.DELETE))
+        expected = (self.ui.window, (APP_NAME,), {})
+        self.assertEqual(self._called[gui.SIG_USER_CANCELATION], expected)
+
     def test_every_cancel_emits_proper_signal(self):
         """Clicking on any cancel button, 'user-cancelation' signal is sent."""
         sig = gui.SIG_USER_CANCELATION