Merge lp:~thisfred/ubuntuone-client/fix-server-show into lp:ubuntuone-client

[Eric Casteleijn]

This adds the correct callback for the server entry in the messaging menu, and calls server.show() only once, rather than every time a message is added.

This adds the correct callback for the server entry in the messaging menu, and calls server.show() only once, rather than every time a message is added.

[Alejandro J. Cura (alecu)]

Working for me as intended

review: Approve

[Natalia Bidart (nataliabidart)]

This branch fixes the opening of the control panel when clicking in the messaging entry. I still have 2 entries when syncdaemon is not running.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~thisfred/ubuntuone-client/fix-server-show into lp:ubuntuone-client failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.16
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent lib...

=== modified file 'tests/platform/linux/test_messaging.py'
--- tests/platform/linux/test_messaging.py	2011-02-08 22:12:36 +0000
+++ tests/platform/linux/test_messaging.py	2011-02-23 23:47:32 +0000
@@ -22,10 +22,10 @@
 """
 
 
-from mocker import Mocker
+from mocker import Mocker, ANY
 from twisted.trial.unittest import TestCase
 
-from ubuntuone.platform.linux.messaging import Messaging, hide_message
+from ubuntuone.platform.linux.messaging import Messaging, _server_callback
 
 FAKE_TIME = 123
 FAKE_TIME2 = 456
@@ -51,22 +51,24 @@
 
     # pylint: disable=R0913
     def _show_message_setup(self, message_time=None, message_count=None,
-                            icon=None, update_count=None, hide=False):
+                            icon=None, update_count=None, real_callback=False):
         """Set up the mocker expectations for show_method."""
         indicate = self.mocker.replace("indicate")
         mock_server = self.mocker.mock()
         indicate.indicate_server_ref_default()
         self.mocker.result(mock_server)
+        mock_server.connect('server-display', _server_callback)
         mock_server.set_type("message.u1")
         mock_server.set_desktop_file(
             "/usr/share/applications/ubuntuone-control-panel-gtk.desktop")
+        mock_server.show()
         mock_indicator = self.mocker.mock()
         indicate.Indicator()
         self.mocker.result(mock_indicator)
         mock_indicator.set_property("subtype", "u1")
         mock_indicator.set_property("name", FAKE_SENDER)
         mock_indicator.set_property("sender", FAKE_SENDER)
-        mock_indicator.connect("user-display", callback)
+        mock_indicator.connect("user-display", ANY)
         if icon is not None:
             mock_indicator.set_property_icon("icon", icon)
         if message_count is not None:
@@ -80,15 +82,17 @@
             else:
                 mock_indicator.set_property_time("time", message_time)
         mock_indicator.set_property("draw-attention", "true")
-        mock_server.show()
         if update_count:
             mock_indicator.get_property("count")
             self.mocker.result("1200")
             mock_indicator.set_property("count", '2500')
-        if hide:
+        mock_indicator.show()
+        if real_callback:
+            open_volumes = self.mocker.replace(
+                "ubuntuone.platform.linux.messaging.open_volumes")
+            open_volumes()
             mock_indicator.set_property('draw-attention', 'false')
             mock_indicator.hide()
-        mock_indicator.show()
         self.mocker.replay()
     # pylint: enable=R0913
 
@@ -124,9 +128,12 @@
             FAKE_SENDER, callback, message_count=1200)
         messaging.update_count(indicator, 1300)
 
-    def test_hide_message(self):
-        """On message hide, libnotify receives the proper calls."""
-        self._show_message_setup(hide=True)
+    def test_callback(self):
+        """When the callback fires, libnotify receives the proper calls."""
+        self._show_message_setup(real_callback=True)
         messaging = Messaging()
-        mock_indicator = messaging.show_message(FAKE_SENDER, callback)
-        hide_message(mock_indicator)
+        mock_indicator = messaging.show_message(FAKE_SENDER)
+        self.assertEquals(1, len(messaging.indicators))
+        actual_callback = messaging.create_callback()
+        actual_callback(mock_indicator)
+        self.assertEquals(0, len(messaging.indicators))

=== modified file 'ubuntuone/platform/linux/messaging.py'
--- ubuntuone/platform/linux/messaging.py	2011-02-08 22:12:36 +0000
+++ ubuntuone/platform/linux/messaging.py	2011-02-23 23:47:32 +0000
@@ -36,34 +36,31 @@
 APPLICATION_NAME = 'Ubuntu One Client'
 
 
-def hide_message(indicator):
-    """Remove the message once it has been dealt with."""
-    if USE_INDICATE:
-        indicator.set_property("draw-attention", "false")
-        indicator.hide()
-
-
 # pylint: disable=W0613
-def open_volumes(the_indicator, message_time=None):
+def open_volumes():
     """Open the control panel to the shares tab."""
     subprocess.Popen(
         ['ubuntuone-control-panel-gtk', '--switch-to', 'volumes'])
-    hide_message(the_indicator)
+
+
+def _server_callback(the_indicator, message_time=None):
+    """Open the control panel to the shares tab."""
+    subprocess.Popen(['ubuntuone-control-panel-gtk'])
 # pylint: enable=W0613
 
 
 class Messaging(AbstractMessaging):
     """Notification of the end user."""
 
-    def __init__(self, server_callback=None):  # pylint: disable=W0231
+    def __init__(self, server_callback=_server_callback):
         if USE_INDICATE:
-            self.indicators = {}
+            self.indicators = []
             self.server = indicate.indicate_server_ref_default()
-            if server_callback is not None:
-                self.server.connect("server-display", server_callback)
+            self.server.connect("server-display", server_callback)
             self.server.set_type("message.u1")
             self.server.set_desktop_file(
                 "/usr/share/applications/ubuntuone-control-panel-gtk.desktop")
+            self.server.show()
 
     # pylint: disable=R0913
     def show_message(self, sender, callback=None, message_time=None,
@@ -76,7 +73,7 @@
             indicator.set_property("sender", sender)
 
             if callback is None:
-                callback = open_volumes
+                callback = self.create_callback()
             indicator.connect("user-display", callback)
 
             if icon is not None:
@@ -88,11 +85,22 @@
                     message_time = time()
                 indicator.set_property_time("time", message_time)
             indicator.set_property("draw-attention", "true")
-            self.server.show()
             indicator.show()
+            self.indicators.append(indicator)
             return indicator
     # pylint: enable=R0913
 
+    def create_callback(self, ):
+        """Create the callback to be used."""
+
+        def callback(indicator, message_time=None):  # pylint: disable=W0613
+            """Callback to be executed when message is clicked."""
+            open_volumes()
+            indicator.set_property("draw-attention", "false")
+            indicator.hide()
+            self.indicators.remove(indicator)
+        return callback
+
     def update_count(self, indicator, add_count):
         """Update the count for an existing indicator."""
         if USE_INDICATE:

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-02-23 00:11:12 +0000
+++ ubuntuone/status/aggregator.py	2011-02-23 23:47:32 +0000
@@ -30,7 +30,7 @@
 from ubuntuone.logger import basic_formatter, logging
 from ubuntuone.platform import session
 from ubuntuone.platform.notification import Notification
-from ubuntuone.platform.messaging import Messaging, open_volumes
+from ubuntuone.platform.messaging import Messaging
 from ubuntuone.platform.unity import UbuntuOneLauncher
 
 Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
@@ -757,10 +757,12 @@
         self.notification.send_notification(
             UBUNTUONE_TITLE, UDFAvailableStatus(udf=udf).one())
 
+    # pylint: disable=W0613
     def _reset_udf_message_callback(self, indicator, message_time=None):
         """A callback wrapper that resets the udf_message to None."""
         self.udf_message = None
-        open_volumes(indicator, message_time=message_time)
+        self.messaging.create_callback()()
+    # pylint: enable=W0613
 
     def server_connection_lost(self):
         """The client lost the connection to the server."""