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

[dobey]

Start the control panel, not the old installer which no longer exists.

[Alejandro J. Cura (alecu)]

Looks good

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-client/fix-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 under...

=== modified file 'tests/platform/messaging/test_linux.py'
--- tests/platform/messaging/test_linux.py	2012-05-02 20:14:50 +0000
+++ tests/platform/messaging/test_linux.py	2012-10-01 14:46:19 +0000
@@ -39,7 +39,7 @@
 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,
@@ -160,3 +160,11 @@
         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.glib, "spawn_command_line_async", data.append)
+        _server_callback(None)
+        self.assertEqual(data, ['ubuntuone-control-panel-qt'])

=== modified file 'tests/platform/sync_menu/test_linux.py'
--- tests/platform/sync_menu/test_linux.py	2012-09-28 11:57:39 +0000
+++ tests/platform/sync_menu/test_linux.py	2012-10-01 14:46:19 +0000
@@ -177,7 +177,7 @@
 
         self.patch(linux.glib, "spawn_command_line_async", data.append)
         self.sync_menu.open_control_panel()
-        self.assertEqual(data, ['ubuntuone-installer'])
+        self.assertEqual(data, ['ubuntuone-control-panel-qt'])
 
     def test_go_to_web(self):
         """Check that the proper action is executed."""

=== modified file 'ubuntuone/platform/messaging/linux.py'
--- ubuntuone/platform/messaging/linux.py	2012-04-30 17:33:18 +0000
+++ ubuntuone/platform/messaging/linux.py	2012-10-01 14:46:19 +0000
@@ -34,6 +34,7 @@
 # of them are available, we should fall back to silently discarding
 # messages.
 
+import logging
 import sys
 
 indicate = None
@@ -61,6 +62,8 @@
 
 from ubuntuone.status.messaging import AbstractMessaging
 
+logger = logging.getLogger("ubuntuone.platform.Messaging")
+
 
 def open_volumes():
     """Open the control panel to the shares tab."""
@@ -69,8 +72,10 @@
 
 def _server_callback(the_indicator, message_time=None):
     """Open the control panel to the shares tab."""
-    glib.spawn_command_line_async('ubuntuone-installer')
-# pylint: enable=W0613
+    try:
+        glib.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):

=== modified file 'ubuntuone/platform/sync_menu/linux.py'
--- ubuntuone/platform/sync_menu/linux.py	2012-09-28 11:57:39 +0000
+++ ubuntuone/platform/sync_menu/linux.py	2012-10-01 14:46:19 +0000
@@ -140,7 +140,10 @@
 
     def open_control_panel(self, *args):
         """Open the Ubuntu One Control Panel."""
-        glib.spawn_command_line_async('ubuntuone-installer')
+        try:
+            glib.spawn_command_line_async('ubuntuone-control-panel-qt')
+        except glib.GError as e:
+            logger.warning('Failed to open the control panel: %s.' % e)
 
     def open_go_to_web(self, *args):
         """Open the Ubunto One Help Page"""