Merge lp:~dobey/ubuntuone-client/no-msg-menu into lp:ubuntuone-client

[dobey]

Remove the messaging menu integration.

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-client/no-msg-menu 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.69
checking for automake >= 1.10...
  testing automake-1.12... not found.
  testing automake-1.11... found 1.11.6
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.18
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... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking how to create a ustar tar archive... gnutar
checking whether make supports nested variables... 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... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking how to print strings... printf
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 unders...

=== removed directory 'tests/platform/messaging'
=== removed file 'tests/platform/messaging/__init__.py'
--- tests/platform/messaging/__init__.py	2012-04-30 18:55:40 +0000
+++ tests/platform/messaging/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-# Copyright 2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Platform/Messaging test code."""

=== removed file 'tests/platform/messaging/test_linux.py'
--- tests/platform/messaging/test_linux.py	2012-10-11 15:57:48 +0000
+++ tests/platform/messaging/test_linux.py	1970-01-01 00:00:00 +0000
@@ -1,170 +0,0 @@
-# tests.platform.linux.test_messaging
-#
-# Author: Eric Casteleijn <[e-mail]>
-#
-# Copyright 2010-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""
-Test the messaging on linux. These tests are kind of stupid, but at
-least they ensure 100% coverage and hence no silly/syntax errors.
-"""
-
-import sys
-
-from mocker import Mocker, ANY
-from twisted.internet import defer
-from twisted.trial.unittest import TestCase
-from ubuntuone.devtools.testcases import skipIf
-from ubuntuone.platform.messaging import linux
-from ubuntuone.platform.messaging.linux import (
-    Messaging,
-    _server_callback,
-    indicate,
-)
-
-FAKE_TIME = 123
-FAKE_TIME2 = 456
-FAKE_COUNT = 11
-FAKE_SENDER = "Mom"
-FAKE_ICON = object()
-
-
-def callback(indicator, message_time=None):
-    """Dummy callback."""
-    pass
-
-
-@skipIf(indicate is None, "No valid Indicate found.")
-class MessagingTestCase(TestCase):
-    """Test the Messaging API."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(MessagingTestCase, self).setUp()
-        self.mocker = Mocker()
-
-    @defer.inlineCallbacks
-    def tearDown(self):
-        yield super(MessagingTestCase, self).tearDown()
-        self.mocker.restore()
-        self.mocker.verify()
-
-    # pylint: disable=R0913
-    def _show_message_setup(self, message_time=None, message_count=None,
-                            icon=None, update_count=None, real_callback=False):
-        """Set up the mocker expectations for show_method."""
-        mock_server = self.mocker.mock()
-        if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
-            indicate = self.mocker.replace("indicate")
-            indicate.indicate_server_ref_default()
-        else:
-            indicate = self.mocker.replace('gi.repository.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-installer.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", ANY)
-        if icon is not None:
-            mock_indicator.set_property_icon("icon", icon)
-        if message_count is not None:
-            mock_indicator.set_property("count", str(message_count))
-        else:
-            if message_time is not None:
-                mock_indicator.set_property_time("time", message_time)
-        mock_indicator.set_property("draw-attention", "true")
-        if update_count:
-            mock_indicator.get_property("count")
-            self.mocker.result("1200")
-            mock_indicator.set_property("count", '2500')
-        mock_indicator.show()
-        if real_callback:
-            open_volumes = self.mocker.replace(
-                "ubuntuone.platform.messaging.linux.open_volumes")
-            open_volumes()
-            mock_indicator.set_property('draw-attention', 'false')
-            mock_indicator.hide()
-        self.mocker.replay()
-    # pylint: enable=R0913
-
-    def test_show_message(self):
-        """On message, libnotify receives the proper calls."""
-        self._show_message_setup()
-        messaging = Messaging()
-        messaging.show_message(FAKE_SENDER, callback)
-
-    def test_show_message_with_time(self):
-        """On message with time, libnotify receives the proper calls."""
-        self._show_message_setup(FAKE_TIME)
-        messaging = Messaging()
-        messaging.show_message(FAKE_SENDER, callback, message_time=FAKE_TIME)
-
-    def test_show_message_with_icon(self):
-        """On message with icon, libnotify receives the proper calls."""
-        self._show_message_setup(icon=FAKE_ICON)
-        messaging = Messaging()
-        messaging.show_message(FAKE_SENDER, callback, icon=FAKE_ICON)
-
-    def test_show_message_with_count(self):
-        """On message with count, libnotify receives the proper calls."""
-        self._show_message_setup(message_count='1200')
-        messaging = Messaging()
-        messaging.show_message(FAKE_SENDER, callback, message_count=1200)
-
-    def test_update_count(self):
-        """On message count update, libnotify receives the proper calls."""
-        self._show_message_setup(message_count='1200', update_count='1300')
-        messaging = Messaging()
-        messaging.show_message(
-            FAKE_SENDER, callback, message_count=1200)
-        messaging.update_count(messaging.indicators[-1], 1300)
-
-    def test_callback(self):
-        """When the callback fires, libnotify receives the proper calls."""
-        self._show_message_setup(real_callback=True)
-        messaging = Messaging()
-        messaging.show_message(FAKE_SENDER)
-        self.assertEquals(1, len(messaging.indicators))
-        actual_callback = messaging.create_callback()
-        actual_callback(messaging.indicators[-1])
-        self.assertEquals(0, len(messaging.indicators))
-
-    def test_open_u1(self):
-        """Check that the proper action is executed."""
-        data = []
-
-        self.patch(linux, "spawn_command_line_async", data.append)
-        _server_callback(None)
-        self.assertEqual(data, ['ubuntuone-control-panel-qt'])

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2012-10-24 16:08:32 +0000
+++ tests/status/test_aggregator.py	2012-11-15 13:37:20 +0000
@@ -42,7 +42,6 @@
 from ubuntuone.devtools.testcases import skipTest
 from ubuntuone.status import aggregator
 from ubuntuone.status.notification import AbstractNotification
-from ubuntuone.status.messaging import AbstractMessaging
 from ubuntuone.syncdaemon import (
     status_listener,
     RECENT_TRANSFERS,
@@ -194,37 +193,6 @@
     return get_instance
 
 
-class FakeMessaging(AbstractMessaging):
-    """A fake messaging class."""
-
-    def __init__(self):  # pylint: disable=W0231
-        self.messages_shown = {}
-        self.messages_updated = {}
-        self.callbacks = []
-
-    # pylint: disable=R0913
-    def show_message(self, sender, callback=None, message_time=None,
-                     message_count=None, icon=None):
-        """Show a message to the user."""
-        if message_count and sender in self.messages_shown:
-            self.update_count(sender, message_count)
-        self.messages_shown[sender] = (
-            callback, message_time, message_count, icon)
-    # pylint: enable=R0913
-
-    def update_count(self, sender, add_count):
-        """Update the count for an existing indicator."""
-        self.messages_updated[sender] = (sender, add_count)
-
-    def _callback(self, indicator, message_time=None):
-        """Fake callback."""
-        self.callbacks.append((indicator, message_time))
-
-    def create_callback(self):
-        """Create the callback."""
-        return self._callback
-
-
 class FakeStatusAggregator(object):
     """A fake status aggregator."""
 
@@ -813,7 +781,6 @@
         self.patch(aggregator, "StatusAggregator", FakeAggregator)
         self.patch(aggregator, "ToggleableNotification",
                    FakeNotificationSingleton())
-        self.patch(aggregator, "Messaging", FakeMessaging)
         self.fakefsm = None
         self.fakevm = FakeVolumeManager()
         self.status_frontend = aggregator.StatusFrontend()
@@ -1087,11 +1054,6 @@
         self.listener.handle_VM_SHARE_CREATED(SHARE_ID)
         self.assertEqual(
             1, len(self.status_frontend.notification.notifications_shown))
-        msg = self.status_frontend.messaging.messages_shown[FAKE_SENDER]
-        # msg did not receive a time argument
-        self.assertEqual(None, msg[1])
-        # msg did not receive a count argument
-        self.assertEqual(None, msg[2])
 
     def test_already_subscribed_new_udf_available(self):
         """A new udf that was already subscribed."""
@@ -1100,10 +1062,6 @@
         self.listener.handle_VM_UDF_CREATED(udf)
         self.assertEqual(
             0, len(self.status_frontend.notification.notifications_shown))
-        self.assertEqual(
-            0, len(self.status_frontend.messaging.messages_shown))
-        self.assertEqual(
-            0, len(self.status_frontend.messaging.messages_updated))
 
     def test_new_udf_available(self):
         """A new udf is available for subscription."""
@@ -1111,11 +1069,6 @@
         self.listener.handle_VM_UDF_CREATED(udf)
         self.assertEqual(
             1, len(self.status_frontend.notification.notifications_shown))
-        self.assertEqual(
-            0, len(self.status_frontend.messaging.messages_shown))
-        self.assertEqual(
-            0, len(self.status_frontend.messaging.messages_updated))
-        self.assertEqual(0, len(self.status_frontend.messaging.callbacks))
 
     def test_two_new_udfs_available(self):
         """A new udf is available for subscription."""
@@ -1125,10 +1078,6 @@
         self.listener.handle_VM_UDF_CREATED(udf2)
         self.assertEqual(
             2, len(self.status_frontend.notification.notifications_shown))
-        self.assertEqual(
-            0, len(self.status_frontend.messaging.messages_shown))
-        self.assertEqual(
-            0, len(self.status_frontend.messaging.messages_updated))
 
     def test_server_connection_lost(self):
         """The client connected to the server."""

=== removed directory 'ubuntuone/platform/messaging'
=== removed file 'ubuntuone/platform/messaging/__init__.py'
--- ubuntuone/platform/messaging/__init__.py	2012-05-01 11:37:26 +0000
+++ ubuntuone/platform/messaging/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 *-*
-# ubuntuone.syncdaemon.platform.messaging - Messages to the user
-#
-# Copyright 2011-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Module that implements sending messages to the end user."""
-
-# TODO: We may want to enable different messaging systems. When none
-# of them are available, we should fall back to silently discarding
-# messages.
-
-import sys
-
-
-APPLICATION_NAME = 'Ubuntu One Client'
-
-
-if sys.platform == "win32":
-    from ubuntuone.platform.messaging import windows as source
-    hide_message = source.hide_message
-else:
-    from ubuntuone.platform.messaging import linux as source
-    DBUS_BUS_NAME = source.DBUS_BUS_NAME
-    DBUS_IFACE_GUI = source.DBUS_IFACE_GUI
-    TRANSLATION_DOMAIN = source.TRANSLATION_DOMAIN
-    _server_callback = source._server_callback
-
-Messaging = source.Messaging
-open_volumes = source.open_volumes

=== removed file 'ubuntuone/platform/messaging/linux.py'
--- ubuntuone/platform/messaging/linux.py	2012-10-11 15:57:48 +0000
+++ ubuntuone/platform/messaging/linux.py	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
-# ubuntuone.syncdaemon.platform.messaging - Messages to the user
-#
-# Author: Eric Casteleijn <[e-mail]>
-#
-# Copyright 2011-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Module that implements sending messages to the end user."""
-
-# TODO: We may want to enable different messaging systems. When none
-# of them are available, we should fall back to silently discarding
-# messages.
-
-import logging
-import sys
-
-indicate = None
-glib = None
-spawn_command_line_async = None
-try:
-    if 'gobject' in sys.modules and sys.modules['gobject'] is not None:
-        import shlex
-        import indicate as pyindicate
-        import glib as GLib
-        indicate = pyindicate
-        glib = GLib
-        using_gi = False
-
-        def spawn_command_line(command_line):
-            """Spawn the command line."""
-            glib.spawn_async(shlex.split(command_line),
-                    flags=glib.SPAWN_SEARCH_PATH)
-
-        spawn_command_line_async = spawn_command_line
-    else:
-        from gi.repository import GLib
-        glib = GLib
-        from gi.repository import Indicate
-        indicate = Indicate
-        using_gi = True
-        spawn_command_line_async = glib.spawn_command_line_async
-except ImportError:
-    pass
-
-DBUS_BUS_NAME = 'com.ubuntuone.controlpanel.gui'
-DBUS_PATH = '/gui'
-DBUS_IFACE_GUI = 'com.ubuntuone.controlpanel.gui'
-TRANSLATION_DOMAIN = 'ubuntuone-control-panel'
-
-from ubuntuone.status.messaging import AbstractMessaging
-
-logger = logging.getLogger("ubuntuone.platform.Messaging")
-
-
-def open_volumes():
-    """Open the control panel to the shares tab."""
-    _server_callback(None)
-
-
-def _server_callback(the_indicator, message_time=None):
-    """Open the control panel to the shares tab."""
-    try:
-        spawn_command_line_async('ubuntuone-control-panel-qt')
-    except glib.GError as e:
-        logger.warning('Failed to open the control panel: %s' % e)
-
-
-class Messaging(AbstractMessaging):
-    """Notification of the end user."""
-
-    def __init__(self, server_callback=_server_callback):
-        self.server_callback = server_callback
-        self.indicators = []
-        if indicate is None:
-            return
-        if using_gi:
-            self.server = indicate.Server.ref_default()
-        else:
-            self.server = indicate.indicate_server_ref_default()
-        self.server.connect("server-display", server_callback)
-        self.server.set_type("message.u1")
-        self.server.set_desktop_file(
-            "/usr/share/applications/ubuntuone-installer.desktop")
-        self.server.show()
-
-    # pylint: disable=R0913
-    def show_message(self, sender, callback=None, message_time=None,
-                     message_count=None, icon=None):
-        """Show a message in the messaging menu."""
-        if indicate is None:
-            return
-        indicator = indicate.Indicator()
-        indicator.set_property("subtype", "u1")
-        indicator.set_property("name", sender)
-        indicator.set_property("sender", sender)
-
-        if callback is None:
-            callback = self.create_callback()
-        indicator.connect("user-display", callback)
-
-        if icon is not None:
-            indicator.set_property_icon("icon", icon)
-        if message_count is not None:
-            indicator.set_property("count", str(message_count))
-        else:
-            if message_time is not None:
-                indicator.set_property_time("time", message_time)
-        indicator.set_property("draw-attention", "true")
-        indicator.show()
-        self.indicators.append(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."""
-        new_count = int(indicator.get_property('count')) + add_count
-        indicator.set_property('count', str(new_count))

=== removed file 'ubuntuone/platform/messaging/windows.py'
--- ubuntuone/platform/messaging/windows.py	2012-04-30 18:55:40 +0000
+++ ubuntuone/platform/messaging/windows.py	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-# ubuntuone.syncdaemon.platform.messaging - Messages to the user
-#
-# Author: Eric Casteleijn <[e-mail]>
-#
-# Copyright 2011-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Module that implements sending messages to the end user."""
-
-# TODO: We may want to enable different messaging systems. When none
-# of them are available, we should fall back to silently discarding
-# messages.
-
-from ubuntuone.status.messaging import AbstractMessaging
-
-
-class Messaging(AbstractMessaging):
-    """Notification of the end user."""
-
-    # pylint: disable=R0913
-    def show_message(self, sender, callback=None, message_time=None,
-                     message_count=None, icon=None):
-        """Show a message in the messaging menu."""
-        # TODO: make this work
-    # pylint: enable=R0913
-
-    def update_count(self, sender, add_count):
-        """Update the count for an existing indicator."""
-        # TODO: make this work
-
-
-def hide_message(indicator):            # pylint: disable=W0613
-    """Remove the message once it has been dealt with."""
-    # TODO: make this work
-
-
-def open_volumes(the_indicator, message_time=None):  # pylint: disable=W0613
-    """Open the control panel to the shares tab."""
-    # TODO: make this work

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2012-10-24 09:06:01 +0000
+++ ubuntuone/status/aggregator.py	2012-11-15 13:37:20 +0000
@@ -45,7 +45,6 @@
     notification,
     sync_menu
 )
-from ubuntuone.platform.messaging import Messaging
 from ubuntuone.platform.launcher import UbuntuOneLauncher, DummyLauncher
 
 ONE_DAY = 24 * 60 * 60
@@ -823,7 +822,6 @@
         """Initialize this instance."""
         self.aggregator = StatusAggregator(clock=clock)
         self.notification = self.aggregator.get_notification()
-        self.messaging = Messaging()
         self.quota_timer = None
 
         self.syncdaemon_service = service
@@ -900,7 +898,6 @@
 
     def new_share_available(self, share):
         """A new share is available for subscription."""
-        self.messaging.show_message(share.other_visible_name)
         self.notification.send_notification(
             UBUNTUONE_TITLE, ShareAvailableStatus(share=share).one())
 

=== removed file 'ubuntuone/status/messaging.py'
--- ubuntuone/status/messaging.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/status/messaging.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-# ubuntuone.status.messaging - Messages to the user
-#
-# Author: Eric Casteleijn <[e-mail]>
-#
-# Copyright 2011-2012 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Module that defines the interfaces for messaging the end user."""
-
-from abc import ABCMeta, abstractmethod
-
-APPLICATION_NAME = 'Ubuntu One Client'
-
-
-class AbstractMessaging(object):
-    """Abstract Base Class for notification implementations."""
-
-    __metaclass__ = ABCMeta
-
-    # pylint: disable=R0913
-    @abstractmethod
-    def show_message(self, sender, callback=None, message_time=None,
-                     message_count=None, icon=None):
-        """Show a message in the messaging menu."""
-    # pylint: enable=R0913
-
-    @abstractmethod
-    def update_count(self, sender, add_count):
-        """Update the count for an existing indicator."""