Merge lp:~alecu/ubuntuone-client/fix-notification-parameters into lp:ubuntuone-client

[Alejandro J. Cura]

fix the parameters passed to send_notification

fix the parameters passed to send_notification.
The third parameter was supposed to be an icon, but it was being passed a boolean.
Since both parameters are optional, the last parameter passed by the caller was removed.

[Eric Casteleijn (thisfred)]

+1

review: Approve

[Martin Albisetti (beuno)]

review: Approve

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2011-01-14 17:15:40 +0000
+++ tests/status/test_aggregator.py	2011-01-14 22:53:10 +0000
@@ -33,7 +33,7 @@
 
     def send_notification(self, title, message, icon=None, append=False):
         """Show a notification to the user."""
-        self.notifications_shown.append((title, message, append))
+        self.notifications_shown.append((title, message, icon, append))
 
 
 class StatusAggregatorTestCase(TestCase):
@@ -59,7 +59,7 @@
         self.listener.handle_AQ_CHANGE_PUBLIC_ACCESS_OK(share_id, node_id,
                                                         is_public, public_url)
         notification = (aggregator.FILE_PUBLISHED_TITLE,
-                        aggregator.FILE_PUBLISHED_MESSAGE, False)
+                        aggregator.FILE_PUBLISHED_MESSAGE, None, False)
         self.assertIn(notification, self.fake_notification.notifications_shown)
 
 
@@ -73,5 +73,5 @@
         self.listener.handle_AQ_CHANGE_PUBLIC_ACCESS_OK(share_id, node_id,
                                                         is_public, public_url)
         notification = (aggregator.FILE_UNPUBLISHED_TITLE,
-                        aggregator.FILE_UNPUBLISHED_MESSAGE, False)
+                        aggregator.FILE_UNPUBLISHED_MESSAGE, None, False)
         self.assertIn(notification, self.fake_notification.notifications_shown)
 
=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-01-14 17:15:40 +0000
+++ ubuntuone/status/aggregator.py	2011-01-14 22:53:10 +0000
@@ -35,9 +35,9 @@
     def file_published(self):
         """A file was published."""
         self.notification.send_notification(FILE_PUBLISHED_TITLE,
-                                            FILE_PUBLISHED_MESSAGE, False)
+                                            FILE_PUBLISHED_MESSAGE)
 
     def file_unpublished(self):
         """A file was unpublished."""
         self.notification.send_notification(FILE_UNPUBLISHED_TITLE,
-                                            FILE_UNPUBLISHED_MESSAGE, False)
+                                            FILE_UNPUBLISHED_MESSAGE)