Merge lp:~dobey/ubuntuone-control-panel/update-4-2 into lp:ubuntuone-control-panel/stable-4-2

[dobey]

[Mike McCracken]

    - Trivial fix to make a test in test_folders actually run.
    - Add support for menu in separate process on darwin. (LP: #1045939)
    - Connect files service in wizard to enable display of remote folders. (LP: #978043)

[Rodney Dawes]

    - Remove messaging menu integration file.
    - Ignore some of the new pep8 warnings, and fix some others.

[Brian Curtin]

    - Encode the volume path before checking whether or not it is a link.

[Barry Warsaw]

    - Replace the third party simplejson module with the stdlib json module.

[Jeremy Bicha]

    - Don't show Ubuntu One in System Settings when running GNOME.

[Diego Sarmentero]

    - Adding IPC, so the new instances can send messages to the already running instance (LP: #1063927).
    - Remove the text on x button pressed (LP: #1070917).
    - Implementing new share tab design (LP: #1065194, #1056194).
    - Accessing the Share tab from the systray menu and avoid refreshing the menu unnecesary (LP: #1072859 #1063781).

[Diego Sarmentero (diegosarmentero)]

+1
"For a few to be immortal, many must die." [In Time]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntuone-hackers

Unaccepted Authors:

    Barry Warsaw <email address hidden>

[lp:~dobey/ubuntuone-control-panel/update-4-2]

375. By Diego Sarmentero on 2012-12-07

[Mike McCracken]

    - Trivial fix to make a test in test_folders actually run.
    - Add support for menu in separate process on darwin. (LP: #1045939)
    - Connect files service in wizard to enable display of remote folders. (LP: #978043)

[Rodney Dawes]

    - Remove messaging menu integration file.
    - Ignore some of the new pep8 warnings, and fix some others.

[Brian Curtin]

    - Encode the volume path before checking whether or not it is a link.

[Barry Warsaw]

    - Replace the third party simplejson module with the stdlib json module.

[Jeremy Bicha]

    - Don't show Ubuntu One in System Settings when running GNOME.

[Diego Sarmentero]

    - Adding IPC, so the new instances can send messages to the already running instance (LP: #1063927).
    - Remove the text on x button pressed (LP: #1070917).
    - Implementing new share tab design (LP: #1065194, #1056194).
    - Accessing the Share tab from the systray menu and avoid refreshing the menu unnecesary (LP: #1072859 #1063781).

=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2012-08-23 19:01:10 +0000
+++ data/qt/images.qrc	2012-12-07 15:05:43 +0000
@@ -26,6 +26,7 @@
     <file>../twitter.png</file>
     <file>../facebook.png</file>
     <file>../delete_search.png</file>
+    <file>../search.png</file>
     <file>../Ubuntu-R.ttf</file>
     <file>../Ubuntu-B.ttf</file>
     <file>ubuntuone.qss</file>

=== modified file 'data/qt/share_links.ui'
--- data/qt/share_links.ui	2012-08-23 19:01:10 +0000
+++ data/qt/share_links.ui	2012-12-07 15:05:43 +0000
@@ -59,28 +59,73 @@
         </font>
        </property>
        <property name="text">
-        <string>Search files</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search and share files&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="SearchBox" name="line_search">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>400</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="frame">
-        <bool>true</bool>
-       </property>
-      </widget>
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="SearchBox" name="line_search">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>450</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>400</width>
+           <height>16777215</height>
+          </size>
+         </property>
+         <property name="frame">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="btn_search">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>24</width>
+           <height>24</height>
+          </size>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
@@ -89,7 +134,7 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="page">
+     <widget class="QWidget" name="page_public">
       <layout class="QVBoxLayout" name="verticalLayout_4">
        <property name="spacing">
         <number>0</number>
@@ -154,7 +199,7 @@
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="page_2">
+     <widget class="QWidget" name="page_details">
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <property name="spacing">
         <number>0</number>
@@ -303,6 +348,116 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="page_search">
+      <layout class="QVBoxLayout" name="verticalLayout_8">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="leftMargin">
+          <number>15</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="label_search_results">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="font">
+            <font>
+             <weight>75</weight>
+             <bold>true</bold>
+            </font>
+           </property>
+           <property name="text">
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Search Results&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="back_to_file_list_2">
+           <property name="text">
+            <string>Back to file list</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QTreeWidget" name="tree_search_results">
+         <property name="alternatingRowColors">
+          <bool>true</bool>
+         </property>
+         <property name="indentation">
+          <number>15</number>
+         </property>
+         <property name="rootIsDecorated">
+          <bool>false</bool>
+         </property>
+         <attribute name="headerVisible">
+          <bool>false</bool>
+         </attribute>
+         <attribute name="headerDefaultSectionSize">
+          <number>250</number>
+         </attribute>
+         <attribute name="headerStretchLastSection">
+          <bool>true</bool>
+         </attribute>
+         <column>
+          <property name="text">
+           <string notr="true">Filename</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string notr="true">Actions</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_no_results">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>You have no files with this name.</string>
+         </property>
+         <property name="indent">
+          <number>20</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
   </layout>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2012-10-12 19:38:02 +0000
+++ data/qt/ubuntuone.qss	2012-12-07 15:05:43 +0000
@@ -402,7 +402,7 @@
     background-origin: margin;
 }
 
-QPushButton#back_to_file_list {
+QPushButton#back_to_file_list, QPushButton#back_to_file_list_2 {
     background: transparent;
     border: none;
     color: #dd4814;

=== added file 'data/search.png'
Binary files data/search.png	1970-01-01 00:00:00 +0000 and data/search.png	2012-12-07 15:05:43 +0000 differ
=== modified file 'run-tests'
--- run-tests	2012-10-23 19:26:30 +0000
+++ run-tests	2012-12-07 15:05:43 +0000
@@ -34,7 +34,7 @@
 style_check() {
     USE_PYFLAKES=1 u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
     if [ -x `which pep8` ]; then
-        pep8 --exclude '.bzr' --repeat . bin/*
+        pep8 --exclude '.bzr,.pc,build' --ignore=E126,E127,E128 --repeat . bin/*
     else
         echo "Please install the 'pep8' package."
     fi

=== modified file 'setup.py'
--- setup.py	2012-05-24 18:59:58 +0000
+++ setup.py	2012-12-07 15:05:43 +0000
@@ -33,17 +33,16 @@
                          'https://launchpad.net/python-distutils-extra'
     sys.exit(1)
 assert DistUtilsExtra.auto.__version__ >= '2.18', \
-       'needs DistUtilsExtra.auto >= 2.18'
+    'needs DistUtilsExtra.auto >= 2.18'
 
 from distutils import log
 
 POT_FILE = 'po/ubuntuone-control-panel.pot'
 SERVICE_FILE = 'com.ubuntuone.controlpanel.service'
-MESSAGE_ENTRY = 'ubuntuone-control-panel'
 CONSTANTS = 'ubuntuone/controlpanel/constants.py'
 
 CLEANFILES = [
-    SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE,
+    SERVICE_FILE, CONSTANTS, POT_FILE,
     'MANIFEST']
 QT_UI_DIR = os.path.join('ubuntuone', 'controlpanel', 'gui', 'qt', 'ui')
 
@@ -51,7 +50,7 @@
 def replace_prefix(prefix):
     """Replace every '@prefix@' with prefix within 'filename' content."""
     # replace .service file, DATA_DIR constant
-    for filename in (SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS):
+    for filename in (SERVICE_FILE, CONSTANTS):
         with open(filename + '.in') as in_file:
             content = in_file.read()
             with open(filename, 'w') as out_file:
@@ -116,7 +115,7 @@
         os.putenv('PATH', path + os.path.pathsep + os.path.join(
                   os.path.dirname(PyQt4.__file__), 'bin'))
         if os.system('pyrcc4 -no-compress "%s" -o "%s"' %
-            (qrc_file, py_file)) > 0:
+                     (qrc_file, py_file)) > 0:
             self.warn('Unable to generate python module {py_file}'
                       ' for resource file {qrc_file}'.format(
                       py_file=py_file, qrc_file=qrc_file))
@@ -159,7 +158,7 @@
 
     def run(self):
         """Execute the command."""
-        basepath = os.path.join('data',  'qt')
+        basepath = os.path.join('data', 'qt')
         # TODO: build the resource files so that we can include them
         #self.build_rc(os.path.join(basepath, 'icons_rc.py'),
         #              os.path.join(os.path.dirname(__file__), 'icons'),
@@ -217,7 +216,6 @@
         ('lib/ubuntuone-control-panel',
          ['bin/ubuntuone-control-panel-backend']),
         ('share/dbus-1/services/', [SERVICE_FILE]),
-        ('share/indicators/messages/applications/', [MESSAGE_ENTRY]),
         ('share/apport/package-hooks/',
          ['data/source_ubuntuone-control-panel.py']),
     ],

=== added file 'ubuntuone-control-panel-qt-gnome.desktop.in'
--- ubuntuone-control-panel-qt-gnome.desktop.in	1970-01-01 00:00:00 +0000
+++ ubuntuone-control-panel-qt-gnome.desktop.in	2012-12-07 15:05:43 +0000
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Ubuntu One
+_Comment=Configure and manage your Ubuntu One account
+Exec=ubuntuone-control-panel-qt
+Icon=ubuntuone
+Terminal=false
+Type=Application
+OnlyShowIn=GNOME;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-PersonalSettings
+StartupNotify=true
+X-Ayatana-Appmenu-Show-Stubs=False

=== removed file 'ubuntuone-control-panel.in'
--- ubuntuone-control-panel.in	2011-09-16 14:37:20 +0000
+++ ubuntuone-control-panel.in	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-@prefix@/share/applications/ubuntuone-installer.desktop

=== modified file 'ubuntuone-installer.desktop.in'
--- ubuntuone-installer.desktop.in	2012-09-10 14:12:04 +0000
+++ ubuntuone-installer.desktop.in	2012-12-07 15:05:43 +0000
@@ -5,6 +5,7 @@
 Icon=ubuntuone
 Terminal=false
 Type=Application
+NotShowIn=GNOME;
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
 StartupNotify=true
 X-Ayatana-Appmenu-Show-Stubs=False

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2012-10-29 16:02:46 +0000
+++ ubuntuone/controlpanel/backend.py	2012-12-07 15:05:43 +0000
@@ -226,10 +226,17 @@
             self.sd_client.set_status_changed_handler(cb)
             self.is_sd_client_handler_set = True
 
+    def remove_status_changed_handler(self, handler):
+        """Remove 'handler' from callbacks list."""
+        if handler in self._status_changed_handlers:
+            self._status_changed_handlers.remove(handler)
+
     @inlineCallbacks
     def _process_device_web_info(self, devices,
-        enabled=None, limit_bw=None, limits=None, autoconnect=None,
-        show_notifs=None, share_autosubscribe=None, udf_autosubscribe=None):
+                                 enabled=None, limit_bw=None,
+                                 limits=None, autoconnect=None,
+                                 show_notifs=None, share_autosubscribe=None,
+                                 udf_autosubscribe=None):
         """Return a lis of processed devices.
 
         If all the file sync settings are None, do not attach that info.
@@ -275,8 +282,10 @@
 
     @inlineCallbacks
     def _process_device_local_info(self,
-        enabled=None, limit_bw=None, limits=None, autoconnect=None,
-        show_notifs=None, share_autosubscribe=None, udf_autosubscribe=None):
+                                   enabled=None, limit_bw=None,
+                                   limits=None, autoconnect=None,
+                                   show_notifs=None, share_autosubscribe=None,
+                                   udf_autosubscribe=None):
         """Return the information for the local device.
 
         If all the file sync settings are None, do not attach that info.

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-10-23 19:26:30 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-12-07 15:05:43 +0000
@@ -232,18 +232,24 @@
 NO_DEVICES = _('No devices to show.')
 NO_FOLDERS = _('No folders to show.')
 NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
+NO_RESULTS = _('No results')
+NO_RESULTS_LABEL = _('You have no files with this name.')
 OPEN = _('Open')
 OPEN_UBUNTU_ONE = _('Open Ubuntu One')
 OPEN_UBUNTU_ONE_FOLDER = _('Open the Ubuntu One Folder')
 PERCENTAGE_LABEL = _('%(percentage)s used')
 PLEASE_WAIT = _('Please wait')
 PROFILE_LABEL = _('Personal details')
+SHARE_FILE = _('Share file')
+SHARE_THESE_FILES = _('Select a file to share:')
 QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
 REMOVE_BUTTON = _('Remove')
 RECENT_TRANSFERS = _('Recent Transfers')
 RESTORE_LABEL = _('Restore')
-SEARCH_FILES = _('Search files')
+SEARCH_FILES = _('Search and share files')
 SELECT_FOLDERS = _('Select sync folders')
+SEARCH_FOR = _('Search for: %s')
+SEARCH_RESULTS = _('Search Results for "%s"')
 SERVICES_BUTTON_TOOLTIP = _('Manage the sync services')
 SERVICES_TITLE = _('Enable the sync services for this computer.')
 SETTINGS_ALLOW_NOTIFICATIONS = _('Allow all notifications to this device')

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-10-16 11:31:33 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-12-07 15:05:43 +0000
@@ -100,7 +100,7 @@
 
     @log_call(logger.debug)
     def on_credentials_not_found(self):
-        """Credentials are not found or were removed."""
+        """Credentials not found / were removed. Log in, then show wizard."""
         self.ui.wizard.restart()
         self.ui.switcher.setCurrentWidget(self.ui.wizard)
         # By design request, when the user logs in, he has to end
@@ -113,10 +113,14 @@
     @defer.inlineCallbacks
     @log_call(logger.debug)
     def on_credentials_found(self):
-        """Credentials are not found or were removed."""
+        """Credentials are found on first try, connect and show mgmt UI."""
+        self.connect_file_sync()
+        yield self.show_management_ui()
+
+    @defer.inlineCallbacks
+    def show_management_ui(self):
+        """Show mgmt UI. File sync is already connected if desired."""
         self.ui.switcher.setCurrentWidget(self.ui.management)
-        self.connect_file_sync()
-
         info = yield self.backend.account_info()
         self.process_info(info)
         self.is_processing = False
@@ -182,7 +186,8 @@
     @log_call(logger.info)
     def on_wizard_finished(self, status):
         """Move to controlpanel if wizard ended successfully."""
-        self.on_credentials_found()
+        # NOTE: the wizard has connected the files service already
+        self.show_management_ui()
 
     @log_call(logger.info)
     def start_from_license(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2012-08-07 01:37:24 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2012-12-07 15:05:43 +0000
@@ -331,7 +331,8 @@
                     os.path.exists(volume_path))
         response = YES
         if subscribed and os.path.exists(volume_path):
-            if os.path.isdir(volume_path) and not is_link(volume_path):
+            if os.path.isdir(volume_path) and \
+                    not is_link(volume_path.encode("utf8")):
                 text = FOLDERS_CONFIRM_MERGE % {'folder_path': volume_path}
                 buttons = YES | NO | CANCEL
                 response = QtGui.QMessageBox.warning(self, '', text, buttons,
@@ -522,8 +523,8 @@
             folders = []
             for _, _, volumes in volumes_info:
                 for volume in volumes:
-                    if (volume[u'type'] == self.backend.FOLDER_TYPE and
-                        bool(volume['subscribed'])):
+                    if volume[u'type'] == self.backend.FOLDER_TYPE and \
+                            bool(volume['subscribed']):
                         suggested = volume.get(u'suggested_path',
                             volume[u'display_name'])
                         folders.append((volume['path'], volume['volume_id'],

=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-08-20 17:51:54 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-12-07 15:05:43 +0000
@@ -61,6 +61,21 @@
         else:
             self.entry = None
 
+    def connect_app_signal(self, app):
+        """Connect App signals."""""
+        app.switch_to.connect(self.switch_to)
+        app.activate_window.connect(self.raise_to_top)
+
+    def raise_to_top(self):
+        """Force the application to raise in top of any other app."""
+        self.activateWindow()
+        self.raise_()
+        if self.isMinimized():
+            self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint)
+            self.showNormal()
+            self.setWindowFlags(QtCore.Qt.Window)
+            self.showNormal()
+
     def _setup(self):
         """Do some extra setupping for the UI."""
         self.ui.control_panel.finished.connect(self.close)
@@ -128,6 +143,7 @@
         window.check_updates()
         window.show()
         window.raise_()
+        window.connect_app_signal(app)
     else:
         window = None
     if with_icon or minimized:

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-10-23 19:26:30 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-12-07 15:05:43 +0000
@@ -40,10 +40,14 @@
 
 if sys.platform == 'darwin':
     from ubuntuone.controlpanel.gui.qt.main.darwin import (
-        install_platform_event_handlers)
+        install_platform_event_handlers, MenubarIconLauncher)
     assert(install_platform_event_handlers)
+    assert(MenubarIconLauncher)
 else:
-    install_platform_event_handlers = lambda app: None
+    class MenubarIconLauncher:
+        """Dummy. Separate menu launcher not used on win/linux."""
+    install_platform_event_handlers = lambda app, **kwargs: None
+
 # pylint: enable=C0103
 
 from ubuntuone.controlpanel.utils import install_config_and_daemons
@@ -118,9 +122,7 @@
     args = parser.parse_args(args=arg_list[bin_position:])
     switch_to = args.switch_to
     minimized = args.minimized
-    # On Darwin, because of how apps are started, we need
-    # this by default.
-    with_icon = args.with_icon or sys.platform == 'darwin'
+    with_icon = args.with_icon
     installer = args.installer
     source.main(app)
 
@@ -135,9 +137,17 @@
 
     install_config_and_daemons()
 
+    if sys.platform == 'darwin':
+        with_icon = False
+        # cmd-q in CP shouldn't kill SD or the menu:
+        quit_kills_sd = False
+    else:
+        quit_kills_sd = not with_icon
+
     # need to keep a reference to the menu or our handler will be
     # removed
-    menubar = install_platform_event_handlers(app)
+    menubar = install_platform_event_handlers(app,
+                                              quit_kills_sd=quit_kills_sd)
     menubar
 
     # Unused variable 'window', 'icon', pylint: disable=W0612
@@ -151,4 +161,10 @@
     if icon:
         app.new_instance.connect(icon.restore_window)
 
+    if sys.platform == 'darwin':
+        # start separate menu app instead of Qt systray menu, waiting
+        # until it is safe to do so without IPC races:
+        menu_launcher = MenubarIconLauncher()
+        assert(menu_launcher)
+
     source.main_start(app)

=== modified file 'ubuntuone/controlpanel/gui/qt/main/darwin.py'
--- ubuntuone/controlpanel/gui/qt/main/darwin.py	2012-10-04 20:34:22 +0000
+++ ubuntuone/controlpanel/gui/qt/main/darwin.py	2012-12-07 15:05:43 +0000
@@ -16,28 +16,40 @@
 
 """Darwin-specific GUI event handling code."""
 
+import sys
+import subprocess
+
 from PyQt4 import QtGui
 from twisted.internet.defer import inlineCallbacks
 
+from dirspec.utils import get_program_path
+
 from ubuntuone.platform.tools import SyncDaemonTool
 
+from ubuntuone.controlpanel import cache
+from ubuntuone.controlpanel.backend import (STATUS_KEY, FILE_SYNC_ERROR)
 from ubuntuone.controlpanel.gui.qt.main import twisted_main
+from ubuntuone.controlpanel.logger import setup_logging
+
+
+logger = setup_logging('qt.main.darwin')
 
 
 @inlineCallbacks
-def handle_cmd_q(app, event):
+def handle_cmd_q(app, event, should_quit_sd=False):
     """Handle the quit event on darwin."""
     # pylint: disable=W0702
-    try:
-        st = SyncDaemonTool()
-        yield st.quit()
-    except:
-        pass
+    if should_quit_sd:
+        try:
+            st = SyncDaemonTool()
+            yield st.quit()
+        except:
+            pass
     twisted_main.main_quit(app)
     app.aboutToQuit.emit()
 
 
-def install_platform_event_handlers(app):
+def install_platform_event_handlers(app, quit_kills_sd=False):
     """Add code to catch cmd-Q."""
     # on darwin, a menu item with 'quit' in its title is moved to
     # the application menu and given the cmd-Q shortcut by Qt. If
@@ -52,9 +64,41 @@
 
     quit_action = QtGui.QAction("quit", menubar,
                                 triggered=lambda x:
-                                handle_cmd_q(app, x))
+                                handle_cmd_q(app,
+                                             x,
+                                             quit_kills_sd))
     quit_action.setObjectName("darwin-cmd-q")
     menu = menubar.addMenu("This string is not used.")
     menu.addAction(quit_action)
 
     return menubar
+
+
+class MenubarIconLauncher(cache.Cache):
+    """Listens to status, launches the menubar app once it is safe to do so."""
+
+    def __init__(self):
+        """Register as listener."""
+        super(MenubarIconLauncher, self).__init__()
+        self.backend.add_status_changed_handler(self.handle_status_update)
+
+    def handle_status_update(self, result):
+        """Process updates, launch menu on non-error"""
+
+        if result[STATUS_KEY] == FILE_SYNC_ERROR:
+            logger.warning("not starting menu, file sync in error state")
+            return
+
+        self.start_menu_process()
+        self.backend.remove_status_changed_handler(self.handle_status_update)
+
+    def start_menu_process(self):
+        """Find and launch separate menu process."""
+        if getattr(sys, 'frozen', None) is None:
+            logger.warning("Can not launch pyobjc menu from source, ignoring.")
+            return
+        menu_app_name = 'Ubuntu One Menu'
+        path = get_program_path(menu_app_name,
+                                app_names={menu_app_name:
+                                           'Ubuntu One Menu.app'})
+        subprocess.Popen(path)

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_darwin.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_darwin.py	2012-10-04 20:34:22 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_darwin.py	2012-12-07 15:05:43 +0000
@@ -18,8 +18,12 @@
 
 from PyQt4 import QtGui
 
+import subprocess
+import sys
+
 from twisted.internet.defer import (inlineCallbacks, succeed)
 
+from ubuntuone.controlpanel import backend
 from ubuntuone.controlpanel.gui.qt import main
 from ubuntuone.controlpanel.tests import TestCase
 from ubuntuone.controlpanel.gui.tests import FakeSignal
@@ -60,6 +64,28 @@
         raise Exception("exception")
 
 
+class FakeBackend(object):
+    """Mock backend"""
+
+    def __init__(self):
+        """init"""
+
+        super(FakeBackend, self).__init__()
+        self.handlers = []
+
+    def add_status_changed_handler(self, h):
+        """add handler"""
+        self.handlers.append(h)
+
+    def remove_status_changed_handler(self, h):
+        """remove handler """
+        self.handlers.remove(h)
+
+    def clear(self):
+        """reset handlers"""
+        self.handlers = []
+
+
 class QuitTestCase(TestCase):
     """Test quit event handling."""
 
@@ -73,13 +99,22 @@
 
     @inlineCallbacks
     def test_cmd_q_func_quits_sd(self):
-        """Test that we call syncdaemontool.quit """
+        """Test that we call syncdaemontool.quit when asked"""
         self.patch(main.darwin, 'SyncDaemonTool', FakeSDTool)
 
-        yield main.darwin.handle_cmd_q(self.fake_app, None)
+        yield main.darwin.handle_cmd_q(self.fake_app, None,
+                                       should_quit_sd=True)
         self.assertEqual(FakeSDTool.called, True)
 
     @inlineCallbacks
+    def test_cmd_q_func_doesnt_quit_sd(self):
+        """Test that we don't call syncdaemontool.quit by default"""
+        self.patch(main.darwin, 'SyncDaemonTool', FakeSDTool)
+
+        yield main.darwin.handle_cmd_q(self.fake_app, None)
+        self.assertEqual(FakeSDTool.called, False)
+
+    @inlineCallbacks
     def test_cmd_q_func_ignores_exception(self):
         """Test that we keep going when SDT raises."""
         self.patch(main.darwin, 'SyncDaemonTool', FakeSDToolRaising)
@@ -93,12 +128,76 @@
 class InstallEventHandlersTestCase(TestCase):
     """Test creating Qt menu items."""
 
-    def test_install_handlers_creates_action(self):
-        """Test menu items created"""
+    def test_install_handlers_creates_kill_action(self):
+        """Test creating menu item that will kill sd"""
+        self.patch(main.darwin, 'handle_cmd_q',
+                   self._set_called)
+        app = QtGui.QApplication.instance()
+        k = dict(quit_kills_sd=True)
+        menubar = main.darwin.install_platform_event_handlers(app, **k)
+        quit_action = menubar.findChild(QtGui.QAction, "darwin-cmd-q")
+        quit_action.trigger()
+        self.assertEqual(self._called, ((app, False, True), {}))
+
+    def test_install_handlers_creates_nonkill_action(self):
+        """Test creating menu item that will not kill sd"""
         self.patch(main.darwin, 'handle_cmd_q',
                    self._set_called)
         app = QtGui.QApplication.instance()
         menubar = main.darwin.install_platform_event_handlers(app)
         quit_action = menubar.findChild(QtGui.QAction, "darwin-cmd-q")
         quit_action.trigger()
-        self.assertEqual(self._called, ((app, False), {}))
+        self.assertEqual(self._called, ((app, False, False), {}))
+
+
+class LauncherTestCase(TestCase):
+    """Test pyobjc menu launcher."""
+
+    @inlineCallbacks
+    def setUp(self):
+        """Set up launcher and patches"""
+        yield super(LauncherTestCase, self).setUp()
+
+        self.patch(backend, 'ControlBackend', FakeBackend)
+        self.patch(main.darwin, 'get_program_path',
+                   lambda a, **kw: 'testpath')
+        self.addCleanup(lambda: self.launcher.backend.clear())
+
+        self.launcher = main.darwin.MenubarIconLauncher()
+
+    def test_add_on_init(self):
+        """Test adding to handler."""
+        self.assertEqual(self.launcher.backend.handlers,
+                         [self.launcher.handle_status_update])
+
+    def test_handle_status_update_error(self):
+        """Test doing nothing on error in handle_status_update"""
+        self.patch(self.launcher, 'start_menu_process', self._set_called)
+        self.launcher.handle_status_update({backend.STATUS_KEY:
+                                            backend.FILE_SYNC_ERROR})
+        self.assertEqual(self._called, False)
+
+    def test_handle_status_update(self):
+        """Test calling start_menu_process and removing handler"""
+        self.patch(self.launcher, 'start_menu_process', self._set_called)
+        self.launcher.handle_status_update({backend.STATUS_KEY: 'copacetic'})
+        self.assertEqual(self._called, ((), {}))
+        self.assertEqual(self.launcher.backend.handlers, [])
+
+    def test_start_menu_process_nonfrozen(self):
+        """Start does nothing when not frozen."""
+        sys.frozen = None
+        self.addCleanup(delattr, sys, 'frozen')
+
+        self.patch(subprocess, 'Popen', self._set_called)
+        self.launcher.start_menu_process()
+        self.assertEqual(self._called, False)
+
+    def test_start_menu_process_frozen(self):
+        """Start launches menu when frozen."""
+        sys.frozen = 'macosx'
+        self.addCleanup(delattr, sys, 'frozen')
+
+        self.patch(subprocess, 'Popen', self._set_called)
+        self.launcher.start_menu_process()
+        self.assertEqual(self._called, (('testpath',), {}))

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-10-04 20:47:39 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-12-07 15:05:43 +0000
@@ -137,7 +137,7 @@
         self.patch(main.source, "main_start", lambda app: None)
         self.patch(QtCore, "QTranslator", lambda: self.translator)
         self.patch(main, 'install_platform_event_handlers',
-                   lambda app: None)
+                   lambda app, **kwargs: None)
 
         self.qt4reactor_installed = False
 
@@ -194,11 +194,11 @@
             {'minimized': True, 'with_icon': False, 'installer': False})
 
     def test_darwin_defult_is_with_icon(self):
-        """On Darwin, the default is to show the icon."""
+        """On Darwin, the default is not to show the icon."""
         self.patch(sys, 'platform', 'darwin')
         main.main([sys.argv[0]])
         self.assertEqual(self.start.args[1],
-            {'minimized': False, 'with_icon': True, 'installer': False})
+            {'minimized': False, 'with_icon': False, 'installer': False})
 
     def test_not_darwin_defult_is_with_icon(self):
         """On Not-darwin, the default is to not show the icon."""
@@ -215,7 +215,7 @@
             {'minimized': True, 'with_icon': False, 'installer': False})
 
     def test_with_icon_option(self):
-        """Ensure the --minimized option is parsed and passed correctly."""
+        """Ensure the --with-icon option is parsed and passed correctly."""
         self.patch(sys, 'platform', 'not-darwin')
         main.main([sys.argv[0], "--with-icon"])
         self.assertEqual(self.start.args[1],
@@ -274,7 +274,7 @@
         """Ensure the new_instance signal is connected."""
         main.main([sys.argv[0]])
         self.assertEqual(self.app.new_instance.target,
-            self.start.window.raise_)
+            [self.start.window.raise_])
 
     def test_darwin_installs_qt4reactor(self):
         """Ensure the qt4 reactor is installed when requested."""
@@ -308,10 +308,20 @@
         main.main([sys.argv[0]], install_reactor_darwin=False)
         self.assertEqual(self._called, ((), {}))
 
-    def test_install_event_handlers(self):
-        """Test that install_platform_event_handlers is called."""
+    def test_install_event_handlers_darwin(self):
+        """Test that install_platform_event_handlers is called on darwin."""
+        self.patch(sys, 'platform', 'darwin')
         self.patch(main, 'install_platform_event_handlers',
                    self._set_called)
 
         main.main([sys.argv[0]], install_reactor_darwin=False)
-        self.assertEqual(self._called, ((self.app,), {}))
+        self.assertEqual(self._called, ((self.app,), {'quit_kills_sd': False}))
+
+    def test_install_event_handlers_non_darwin(self):
+        """Test install_platform_event_handlers is called on not-darwin."""
+        self.patch(sys, 'platform', 'not-darwin')
+        self.patch(main, 'install_platform_event_handlers',
+                   self._set_called)
+
+        main.main([sys.argv[0], '--with-icon'], install_reactor_darwin=False)
+        self.assertEqual(self._called, ((self.app,), {'quit_kills_sd': False}))

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links.py'
--- ubuntuone/controlpanel/gui/qt/share_links.py	2012-10-23 19:26:30 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links.py	2012-12-07 15:05:43 +0000
@@ -27,7 +27,10 @@
 from ubuntuone.controlpanel.gui import (
     COPY_LINK,
     OPEN,
+    SHARE_FILE,
+    NO_RESULTS_LABEL,
     SEARCH_FILES,
+    SEARCH_RESULTS,
     SHARED_FILES,
 )
 
@@ -47,9 +50,14 @@
 logger = setup_logging('qt.share_links')
 
 
+# Table items index
 FILE_NAME_COL = 0
 PUBLIC_LINK_COL = 1
 ACTIONS_COL = 2
+# StackedLayout widgets index
+SHARED_FILES_INDEX = 0
+FILE_DETAILS_INDEX = 1
+SEARCH_RESULTS_INDEX = 2
 
 
 class ShareLinksPanel(UbuntuOneBin):
@@ -67,14 +75,15 @@
         self.home_dir = ''
         self.ui.search_files_lbl.setText(SEARCH_FILES)
         self.ui.shared_group.setTitle(SHARED_FILES)
+        self.ui.btn_search.setIcon(QtGui.QIcon(":/search.png"))
+        self.ui.label_no_results.setText(NO_RESULTS_LABEL)
+        self.ui.label_no_results.hide()
+        self.ui.page_search.layout().setAlignment(QtCore.Qt.AlignTop)
 
         # Set enhanced line edits
         self._enhanced_line = EnhancedLineEdit(self.ui.line_search,
             self._line_close_btn, icon=":/delete_search.png",
             style='enhanced_borderless')
-        self._enhanced_line.btn_operation.hide()
-        self.ui.line_search.popup.popupHidden.connect(
-            self._hide_line_btn_close_hide)
         self.ui.line_search.popup.popupShown.connect(
             self._hide_line_btn_close_show)
         EnhancedLineEdit(self.ui.line_copy_link, self._copy_link_from_line,
@@ -82,15 +91,21 @@
 
         # Set cursor type
         self.ui.back_to_file_list.setCursor(QtCore.Qt.PointingHandCursor)
+        self.ui.back_to_file_list_2.setCursor(QtCore.Qt.PointingHandCursor)
         self.ui.open_in_browser.setCursor(QtCore.Qt.PointingHandCursor)
+        self._enhanced_line.btn_operation.setCursor(
+            QtCore.Qt.ArrowCursor)
 
         self.ui.line_search.itemSelected.connect(self.share_file)
+        self.ui.line_search.filesFound.connect(self._load_search_results)
         self.ui.back_to_file_list.clicked.connect(self._move_to_main_list)
+        self.ui.back_to_file_list_2.clicked.connect(self._move_to_main_list)
         self.ui.open_in_browser.clicked.connect(self._open_in_browser)
         self.ui.tree_shared_files.itemDoubleClicked.connect(
             self._open_properties_selected_file)
 
         self.get_public_files()
+        self._enhanced_line.btn_operation.hide()
 
     @inlineCallbacks
     def share_file(self, file_path):
@@ -118,6 +133,9 @@
         """Open the file properties on double click."""
         file_path = unicode(item.toolTip(FILE_NAME_COL))
         full_path = expand_user(file_path.encode('utf-8')).decode('utf-8')
+        if self.ui.hbox_share_file.count() > 0:
+            widget = self.ui.hbox_share_file.takeAt(0).widget()
+            widget.close()
         self.open_file_properties(file_path, full_path)
 
     def open_file_properties(self, file_path, full_path):
@@ -127,13 +145,13 @@
         share_file_widget.linkDisabled.connect(
             lambda: self.ui.line_copy_link.setText(''))
         self.ui.line_copy_link.setText(self._shared_files[full_path])
-        self.ui.stacked_widget.setCurrentIndex(1)
+        self.ui.stacked_widget.setCurrentIndex(FILE_DETAILS_INDEX)
 
     def _file_shared(self, info):
         """Receive the notification that the file has been published."""
         url = info.get("public_url")
         self.ui.line_copy_link.setText(url)
-        self.ui.stacked_widget.setCurrentIndex(1)
+        self.ui.stacked_widget.setCurrentIndex(FILE_DETAILS_INDEX)
         self.is_processing = False
 
     def _open_in_browser(self):
@@ -148,7 +166,7 @@
 
     def _move_to_main_list(self):
         """Set the share files list as current widget."""
-        self.ui.stacked_widget.setCurrentIndex(0)
+        self.ui.stacked_widget.setCurrentIndex(SHARED_FILES_INDEX)
         self.get_public_files()
 
     @inlineCallbacks
@@ -190,17 +208,46 @@
                 label)
 
             actions = ActionsButtons(path, public_url,
-                self.ui.tree_shared_files)
+                parent=self.ui.tree_shared_files)
             self.ui.tree_shared_files.setItemWidget(item, ACTIONS_COL, actions)
         self.is_processing = False
 
+    def _load_search_results(self, results, prefix):
+        """Load the search results from the search box."""
+        self.ui.tree_search_results.clear()
+        self.ui.label_search_results.setText(SEARCH_RESULTS % prefix)
+        if len(results) > 0:
+            for result in results:
+                item = QtGui.QTreeWidgetItem()
+                name = os.path.basename(result)
+                item.setText(FILE_NAME_COL, name)
+                tooltip = result
+                if tooltip.startswith(self.home_dir):
+                    tooltip = tooltip.replace(self.home_dir, '~', 1)
+                item.setToolTip(FILE_NAME_COL, tooltip)
+                icon = get_system_icon_for_filename(result.encode('utf-8'))
+                item.setIcon(FILE_NAME_COL, icon)
+                self.ui.tree_search_results.setColumnWidth(FILE_NAME_COL, 300)
+
+                item.setSizeHint(FILE_NAME_COL, QtCore.QSize(-1, 35))
+                self.ui.tree_search_results.addTopLevelItem(item)
+
+                actions = ActionsResultsButtons(result, self.share_file,
+                    self.ui.tree_search_results)
+                self.ui.tree_search_results.setItemWidget(item,
+                    PUBLIC_LINK_COL, actions)
+            self.ui.tree_search_results.show()
+            self.ui.label_no_results.hide()
+        else:
+            self.ui.tree_search_results.hide()
+            self.ui.label_no_results.show()
+        self.ui.stacked_widget.setCurrentIndex(SEARCH_RESULTS_INDEX)
+
     def _line_close_btn(self):
         """Close button in the line edit was pressed, hide the popup."""
+        self.ui.line_search.setText('')
         self.ui.line_search.popup.hide()
         self.ui.line_search.setFocus()
-
-    def _hide_line_btn_close_hide(self):
-        """Hide the button inside the search line edit-"""
         self._enhanced_line.btn_operation.hide()
 
     def _hide_line_btn_close_show(self):
@@ -211,23 +258,24 @@
 class ActionsButtons(QtGui.QWidget):
     """Widget that contains the open and copy link actions on the list."""
 
-    def __init__(self, path, link, parent=None):
+    def __init__(self, path, link, parent=None, both_buttons=True):
         super(ActionsButtons, self).__init__(parent)
         self.path = path
         self.link = link
 
-        hbox = QtGui.QHBoxLayout(self)
+        self.hbox = QtGui.QHBoxLayout(self)
+        self.hbox.addSpacerItem(QtGui.QSpacerItem(1, 0,
+            QtGui.QSizePolicy.Expanding))
+
         btn_open = QtGui.QPushButton(OPEN)
-        btn_copy = QtGui.QPushButton(COPY_LINK)
         btn_open.setObjectName('action_button')
-        btn_copy.setObjectName('action_button')
-        hbox.addSpacerItem(QtGui.QSpacerItem(1, 0,
-            QtGui.QSizePolicy.Expanding))
-        hbox.addWidget(btn_open)
-        hbox.addWidget(btn_copy)
-
+        self.hbox.addWidget(btn_open)
         btn_open.clicked.connect(self.open)
-        btn_copy.clicked.connect(self.copy)
+        if both_buttons:
+            btn_copy = QtGui.QPushButton(COPY_LINK)
+            btn_copy.setObjectName('action_button')
+            self.hbox.addWidget(btn_copy)
+            btn_copy.clicked.connect(self.copy)
 
     def open(self):
         """Open the file."""
@@ -240,6 +288,24 @@
         app.clipboard().setText(self.link)
 
 
+class ActionsResultsButtons(ActionsButtons):
+    """Widget that contains: open and publish actions on the results list."""
+
+    def __init__(self, path, publish_function=None, parent=None):
+        super(ActionsResultsButtons, self).__init__(path, '', parent, False)
+        self.publish_function = publish_function
+
+        btn_publish = QtGui.QPushButton(SHARE_FILE)
+        btn_publish.setObjectName('action_button')
+        self.hbox.addWidget(btn_publish)
+        btn_publish.clicked.connect(self.publish_file)
+
+    def publish_file(self):
+        """Publish the file specified."""
+        if self.publish_function is not None:
+            self.publish_function(self.path)
+
+
 class EnhancedLineEdit(object):
     """Add a button inside the QLineEdit received."""
 

=== modified file 'ubuntuone/controlpanel/gui/qt/share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-10-29 14:00:16 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links_search.py	2012-12-07 15:05:43 +0000
@@ -25,10 +25,17 @@
 
 from ubuntuone.controlpanel import cache
 from ubuntuone.controlpanel.logger import setup_logging
+from ubuntuone.controlpanel.gui import (
+    NO_RESULTS,
+    SEARCH_FOR,
+    SHARE_THESE_FILES,
+)
 
 logger = setup_logging('qt.share_links_search')
 
 HOME_DIR = ''
+AVOID_SECOND_ITEM = 2
+NORMAL_INCREMENT = 1
 
 
 def get_system_icon_for_filename(file_path):
@@ -45,6 +52,7 @@
     """Search widget for the synced files."""
 
     itemSelected = QtCore.pyqtSignal(unicode)
+    filesFound = QtCore.pyqtSignal(list, unicode)
 
     def __init__(self, parent=None):
         super(SearchBox, self).__init__(parent)
@@ -56,9 +64,6 @@
         self.items_step = 20
         self.prefix = ''
         self._thread_explore = None
-        self._pre_key_event = {
-            QtCore.Qt.Key_Space: self._key_space_pressed,
-        }
         self._post_key_event = {
             QtCore.Qt.Key_Escape: lambda *args: self.popup.hide(),
             QtCore.Qt.Key_Down: self._key_down_pressed,
@@ -112,7 +117,7 @@
         self.temp_u1_files = [filename for filename in self.temp_u1_files
             if os.path.basename(filename).find(self.prefix) > -1]
         files = self._get_filtered_list(self.temp_u1_files)
-        self.popup.load_items(files)
+        self.popup.load_items(files, self.prefix)
 
     def _get_filtered_list(self, filenames):
         """Get pages of results."""
@@ -121,34 +126,28 @@
         files = [filename for filename in filenames[begin:self.items_per_page]]
         return files
 
-    def _key_space_pressed(self):
-        """The user pressed the space key."""
-        item = self.popup.list_widget.currentItem()
-        if item is None:
-            return False
-        widget = self.popup.list_widget.itemWidget(item)
-        self.setText(widget.name)
-        self.popup.hide()
-        return True
-
-    def _key_down_pressed(self, current):
+    def _key_down_pressed(self, focus_index):
         """The user pressed the down key."""
         #While the current position is lower that the list size go to next
-        if current != self.popup.list_widget.count() - 1:
+        if focus_index != self.popup.list_widget.count() - 1:
+            list_offset = (AVOID_SECOND_ITEM if focus_index == 0 else
+                NORMAL_INCREMENT)
             self.popup.list_widget.setCurrentRow(
-                self.popup.list_widget.currentRow() + 1)
+                self.popup.list_widget.currentRow() + list_offset)
         #If the current position is greater than the amount of items in
         #the list - 6, then try to fetch more items in the list.
-        if current >= (self.popup.list_widget.count() - 6):
+        if focus_index >= (self.popup.list_widget.count() - 6):
             filenames = self._get_filtered_list(self.temp_u1_files)
             self.popup.fetch_more(filenames)
 
-    def _key_up_pressed(self, current):
+    def _key_up_pressed(self, focus_index):
         """The user pressed the up key."""
         #while the current position is greater than 0, go to previous
-        if current > 0:
+        if focus_index > 0:
+            list_offset = (AVOID_SECOND_ITEM if focus_index == 2 else
+                NORMAL_INCREMENT)
             self.popup.list_widget.setCurrentRow(
-                self.popup.list_widget.currentRow() - 1)
+                self.popup.list_widget.currentRow() - list_offset)
 
     def _key_return_pressed(self, current):
         """The user pressed the return key."""
@@ -158,9 +157,6 @@
 
     def keyPressEvent(self, event):
         """Process the different behaviour for the keyPress event."""
-        if self._pre_key_event.get(event.key(), lambda: False)():
-            return
-
         super(SearchBox, self).keyPressEvent(event)
         current = self.popup.list_widget.currentRow()
         self._post_key_event.get(event.key(), lambda *args: None)(current)
@@ -173,8 +169,11 @@
     def _set_selected_item(self, item):
         """Notify of the selected item."""
         widget = self.popup.list_widget.itemWidget(item)
-        self.itemSelected.emit(widget.file_path)
-        self.setText('')
+        if widget is not None:
+            self.itemSelected.emit(widget.file_path)
+            self.setText('')
+        else:
+            self.filesFound.emit(self.temp_u1_files, self.prefix)
         self.popup.hide()
 
     def moveEvent(self, event):
@@ -242,14 +241,36 @@
         """Set the proper style for the current and previous items."""
         if current is not None:
             widget = self.list_widget.itemWidget(current)
-            widget.set_selected()
+            if widget is not None:
+                widget.set_selected()
         if previous is not None:
             widget = self.list_widget.itemWidget(previous)
-            widget.set_not_selected()
-
-    def load_items(self, file_items):
+            if widget is not None:
+                widget.set_not_selected()
+
+    def _add_special_item(self, text):
+        """Add special items to the popup."""
+        item = QtGui.QListWidgetItem(text)
+        font = item.font()
+        font.setBold(True)
+        item.setSizeHint(QtCore.QSize(20, 30))
+        item.setBackground(QtGui.QBrush(QtCore.Qt.lightGray))
+        item.setForeground(QtGui.QBrush(QtCore.Qt.black))
+        item.setFont(font)
+        return item
+
+    def load_items(self, file_items, search_text):
         """Load the initial items."""
         self.list_widget.clear()
+        # Search item
+        self.list_widget.addItem(self._add_special_item(
+            SEARCH_FOR % search_text))
+        # Message item
+        if len(file_items) > 0:
+            message_publish = self._add_special_item(SHARE_THESE_FILES)
+        else:
+            message_publish = self._add_special_item(NO_RESULTS)
+        self.list_widget.addItem(message_publish)
         for file_ in file_items:
             item = QtGui.QListWidgetItem("\n")
             file_widget = FileItem(file_)
@@ -257,8 +278,7 @@
             self.list_widget.setItemWidget(item, file_widget)
             icon = get_system_icon_for_filename(file_.encode('utf-8'))
             item.setIcon(icon)
-        if file_items:
-            self.list_widget.setCurrentRow(0)
+        self.list_widget.setCurrentRow(0)
 
     def fetch_more(self, file_items):
         """Add more items to the list on user scroll."""

=== modified file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	2012-09-05 19:43:16 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2012-12-07 15:05:43 +0000
@@ -36,12 +36,12 @@
     IN_PROGRESS,
     IN_PROGRESS_FILE,
     LOADING,
-    NEW_SHARE_BY,
     OPEN_UBUNTU_ONE,
     OPEN_UBUNTU_ONE_FOLDER,
     PLEASE_WAIT,
     RECENT_TRANSFERS,
     RECENTTRANSFERS,
+    SHARE_A_FILE,
     TRANSFERS,
     UPLOADING,
 )
@@ -122,6 +122,7 @@
         self.quit = None
         self.get_help_online = None
         self.open_u1 = None
+        self.share_a_file = None
         self.status_action = None
         self.go_to_web = None
         self.get_more_storage = None
@@ -130,75 +131,48 @@
         self.backend.add_status_changed_handler(self._process_status)
 
         self.load_menu()
-        # Refresh the Shares every five minutes if needed.
-        self._timer_id = self.startTimer(300000)
-
-    # pylint: disable=C0103
-
-    def timerEvent(self, event):
-        """Update the menu on each iteration."""
-        self.load_menu()
-
-    # pylint: enable=C0103
-
-    @inlineCallbacks
+
     def load_menu(self):
         """Load the content of the menu."""
-        shares_info = yield self.backend.get_shares()
-        shares_info = [share for share in shares_info if not share['accepted']]
-        if shares_info != self._previous_shares:
-            # Items
-            self.context_menu.clear()
-
-            self.status = self.context_menu.addAction(LOADING)
-            self.status.setEnabled(False)
-            self.status_action = self.context_menu.addAction(PLEASE_WAIT)
-            self.refresh_status()
-            self.context_menu.addSeparator()
-
-            self.open_u1 = self.context_menu.addAction(OPEN_UBUNTU_ONE)
-            # TODO: Share a file action when the Shares tab is ready in U1-CP
-            self.open_u1_folder = self.context_menu.addAction(
-                OPEN_UBUNTU_ONE_FOLDER)
-            self.go_to_web = self.context_menu.addAction(GO_TO_WEB)
-            self.context_menu.addSeparator()
-
-            # Shares
-            self._previous_shares = shares_info
-            max_shares = 0
-            for share in self._previous_shares:
-                if max_shares == 3:
-                    break
-                max_shares += 1
-                text = NEW_SHARE_BY % share['other_visible_name']
-                share_action = SharesAction(text, share['volume_id'],
-                    self.context_menu)
-                self.context_menu.addAction(share_action)
-            if self._previous_shares:
-                self.context_menu.addSeparator()
-
-            # Transfers
-            self.transfers = TransfersMenu(self)
-            self.context_menu.addMenu(self.transfers)
-
-            self.get_more_storage = self.context_menu.addAction(
-                GET_MORE_STORAGE)
-            self.get_help_online = self.context_menu.addAction(GET_HELP_ONLINE)
-            self.quit = self.context_menu.addAction("Quit")
-
-            self.setContextMenu(self.context_menu)
-
-            # Connect Signals
-            self.status_action.triggered.connect(self.change_status)
-            self.open_u1.triggered.connect(self.restore_window)
-            self.open_u1_folder.triggered.connect(self.open_u1_folder_action)
-            self.get_more_storage.triggered.connect(
-                self.get_more_storage_action)
-            self.go_to_web.triggered.connect(self.go_to_web_action)
-            self.get_help_online.triggered.connect(self.get_help_action)
-            self.quit.triggered.connect(self.stop)
-
-            self._get_volumes_info()
+        # Items
+        self.context_menu.clear()
+
+        self.status = self.context_menu.addAction(LOADING)
+        self.status.setEnabled(False)
+        self.status_action = self.context_menu.addAction(PLEASE_WAIT)
+        self.refresh_status()
+        self.context_menu.addSeparator()
+
+        self.open_u1 = self.context_menu.addAction(OPEN_UBUNTU_ONE)
+        self.share_a_file = self.context_menu.addAction(SHARE_A_FILE)
+        self.open_u1_folder = self.context_menu.addAction(
+            OPEN_UBUNTU_ONE_FOLDER)
+        self.go_to_web = self.context_menu.addAction(GO_TO_WEB)
+        self.context_menu.addSeparator()
+
+        # Transfers
+        self.transfers = TransfersMenu(self)
+        self.context_menu.addMenu(self.transfers)
+
+        self.get_more_storage = self.context_menu.addAction(
+            GET_MORE_STORAGE)
+        self.get_help_online = self.context_menu.addAction(GET_HELP_ONLINE)
+        self.quit = self.context_menu.addAction("Quit")
+
+        self.setContextMenu(self.context_menu)
+
+        # Connect Signals
+        self.status_action.triggered.connect(self.change_status)
+        self.open_u1.triggered.connect(self.restore_window)
+        self.share_a_file.triggered.connect(self.open_share_tab)
+        self.open_u1_folder.triggered.connect(self.open_u1_folder_action)
+        self.get_more_storage.triggered.connect(
+            self.get_more_storage_action)
+        self.go_to_web.triggered.connect(self.go_to_web_action)
+        self.get_help_online.triggered.connect(self.get_help_action)
+        self.quit.triggered.connect(self.stop)
+
+        self._get_volumes_info()
 
     @inlineCallbacks
     def refresh_status(self):
@@ -278,6 +252,17 @@
         self.window.show()
         self.window.activateWindow()
 
+    def open_share_tab(self):
+        """Show the main window in the share tab."""
+        if self.window is None:
+            # pylint: disable=W0404
+            from ubuntuone.controlpanel.gui.qt.gui import MainWindow
+            # pylint: enable=W0404
+            self.window = MainWindow(close_callback=self.delete_window)
+        self.window.switch_to('share_links')
+        self.window.show()
+        self.window.activateWindow()
+
     def delete_window(self):
         """Close and remove the main window."""
         if self.window is not None:

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-10-08 18:11:55 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-12-07 15:05:43 +0000
@@ -91,10 +91,9 @@
         self.assertEqual(self._called, ((), {}))
 
     def test_on_credentials_found(self):
-        """The management panel is shown."""
+        """File sync is connected and the management panel is shown."""
         self.patch(self.ui, 'connect_file_sync', self._set_called)
-        self.ui.on_credentials_not_found()
-        self.ui.on_credentials_found()
+        yield self.ui.on_credentials_found()
 
         self.assertIs(self.ui.ui.switcher.currentWidget(),
                       self.ui.ui.management)
@@ -154,7 +153,7 @@
 
     def test_on_wizard_finished(self):
         """When the wizard is finished, the management panel is shown."""
-        self.patch(self.ui, 'on_credentials_found', self._set_called)
+        self.patch(self.ui, 'show_management_ui', self._set_called)
         self.ui.ui.wizard.finished.emit(1)
 
         self.assertEqual(self._called, ((), {}))

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-08-07 01:37:10 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-12-07 15:05:43 +0000
@@ -54,9 +54,9 @@
 # pylint: disable=W0212, E1103
 
 DEFAULT_FOLDERS = [u'Music', u'Configuración', 'An invalid folder',
-    os.path.join(u'I ♥ Ubuntu', u'Documents'),
-    os.path.join(u'I ♥ Ubuntu', u'Something', u'Long'),
-]
+                   os.path.join(u'I ♥ Ubuntu', u'Documents'),
+                   os.path.join(u'I ♥ Ubuntu', u'Something', u'Long'),
+                   ]
 
 
 def volumes_with_music_unsubscribed():
@@ -1133,8 +1133,8 @@
         volumes = sorted(volumes, key=operator.itemgetter('path'))
 
         for volume in volumes:
-            if (volume['type'] != self.ui.backend.FOLDER_TYPE or
-                not bool(volume['subscribed'])):
+            if volume['type'] != self.ui.backend.FOLDER_TYPE or \
+                    not bool(volume['subscribed']):
                 # non-folders or unsubscribed should not appear in the tree
                 continue
             self.assert_folder_added(volume['path'],
@@ -1319,6 +1319,7 @@
         yield self.changes_applied
         self.assertEqual(self.ui.backend._called, {})
 
+    @defer.inlineCallbacks
     def test_timer_is_stopped(self):
         """When applying changes, timer is stopped."""
         yield self.ui.apply_changes()

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-10-23 14:24:16 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-12-07 15:05:43 +0000
@@ -57,6 +57,7 @@
             QtCore.Qt.PointingHandCursor)
         self.assertEqual(self.ui.ui.back_to_file_list.cursor().shape(),
             QtCore.Qt.PointingHandCursor)
+        self.assertFalse(self.ui._enhanced_line.btn_operation.isVisible())
 
     def test_share_file(self):
         """Check that the state of the widgets on share_file."""
@@ -76,6 +77,19 @@
         self.assertEqual(len(data), 2)
         self.assertEqual(data[0], self.ui._file_shared)
 
+    def test_open_file_properties(self):
+        """Check that we clean the Details Page before adding a new item."""
+        publicfiles = [
+            {'path': '/home/file1', 'public_url': 'http:ubuntuone.com/asd123'},
+            {'path': '/home/file2', 'public_url': 'http:ubuntuone.com/qwe456'},
+        ]
+        self.ui._load_public_files(publicfiles)
+        item = self.ui.ui.tree_shared_files.topLevelItem(0)
+        self.ui.ui.tree_shared_files.itemDoubleClicked.emit(item, 0)
+        self.assertEqual(self.ui.ui.hbox_share_file.count(), 1)
+        self.ui.ui.tree_shared_files.itemDoubleClicked.emit(item, 0)
+        self.assertEqual(self.ui.ui.hbox_share_file.count(), 1)
+
     def test_share_file_actions(self):
         """Check the behaviour of share_file buttons."""
         path = '/home/user/Ubuntu One/file1.txt'
@@ -91,7 +105,8 @@
         info = {'public_url': 'http://ubuntuone.com/asd123'}
         self.ui._file_shared(info)
         self.assertEqual(self.ui.ui.line_copy_link.text(), info['public_url'])
-        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 1)
+        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(),
+            gui.FILE_DETAILS_INDEX)
         self.assertFalse(self.ui.is_processing)
 
     def test_file_already_shared(self):
@@ -109,7 +124,8 @@
         self.ui._shared_files = shared
         self.ui.share_file(path)
         self.assertEqual(self.ui.ui.line_copy_link.text(), shared[path])
-        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 1)
+        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(),
+            gui.FILE_DETAILS_INDEX)
         self.assertEqual(data, [])
 
     def test_open_in_browser(self):
@@ -133,7 +149,8 @@
     def test_move_to_main_list(self):
         """Test that the stacked widget shows the proper index."""
         self.ui._move_to_main_list()
-        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 0)
+        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(),
+            gui.SHARED_FILES_INDEX)
 
     def test_get_public_files(self):
         """Test that the proper actions are executed on files requested.."""
@@ -142,7 +159,8 @@
             data.append)
         self.ui.get_public_files()
         self.assertTrue(self.ui.is_processing)
-        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(), 0)
+        self.assertEqual(self.ui.ui.stacked_widget.currentIndex(),
+            gui.SHARED_FILES_INDEX)
         self.assertEqual(self.ui.home_dir, USER_HOME)
         self.assertEqual(len(data), 1)
         self.assertEqual(data[0], self.ui._load_public_files)
@@ -153,11 +171,6 @@
         self.addCleanup(self.ui.ui.line_search.popup.hide)
         self.ui._line_close_btn()
         self.assertFalse(self.ui.ui.line_search.popup.isVisible())
-
-    def test_hide_line_btn_close_hide(self):
-        """Check the state of the inline button."""
-        self.ui._enhanced_line.btn_operation.show()
-        self.ui.ui.line_search.popup.popupHidden.emit()
         self.assertFalse(self.ui._enhanced_line.btn_operation.isVisible())
 
     def test_hide_line_btn_close_show(self):
@@ -194,6 +207,35 @@
         actions = self.ui.ui.tree_shared_files.itemWidget(item, 2)
         self.assertIsInstance(actions, gui.ActionsButtons)
 
+    def test_load_search_results(self):
+        """Test if the list of public files is loaded properly."""
+        results = ['/home/file1', '/home/file2']
+        self.ui._load_search_results(results, 'file')
+        item = self.ui.ui.tree_search_results.topLevelItem(0)
+        self.assertEqual(item.text(0), os.path.basename('/home/file1'))
+        self.assertEqual(item.toolTip(0), '/home/file1')
+        actions = self.ui.ui.tree_search_results.itemWidget(item, 1)
+        self.assertIsInstance(actions, gui.ActionsResultsButtons)
+
+        item = self.ui.ui.tree_search_results.topLevelItem(1)
+        self.assertEqual(item.text(0), os.path.basename('/home/file2'))
+        self.assertEqual(item.toolTip(0), '/home/file2')
+        actions = self.ui.ui.tree_search_results.itemWidget(item, 1)
+        self.assertIsInstance(actions, gui.ActionsResultsButtons)
+
+        self.assertEqual(self.ui.ui.label_search_results.text(),
+            gui.SEARCH_RESULTS % 'file')
+        self.assertTrue(self.ui.ui.tree_search_results.isVisible())
+        self.assertFalse(self.ui.ui.label_no_results.isVisible())
+
+    def test_load_search_results_empty_list(self):
+        """Test if the list of public files is loaded properly."""
+        self.ui._load_search_results([], 'file')
+        self.assertEqual(self.ui.ui.label_search_results.text(),
+            gui.SEARCH_RESULTS % 'file')
+        self.assertFalse(self.ui.ui.tree_search_results.isVisible())
+        self.assertTrue(self.ui.ui.label_no_results.isVisible())
+
     def test_tree_item_clicked(self):
         """Check if the proper info is displayed when the item is clicked."""
         publicfiles = [

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-10-29 18:30:31 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py	2012-12-07 15:05:43 +0000
@@ -87,7 +87,7 @@
         self.ui.temp_u1_files = self.ui.backend.search_files('')
         self.ui.temp_u1_files = self.ui.temp_u1_files * 4
         self.ui._load_items()
-        self.assertEqual(self.ui.popup.list_widget.count(), 20)
+        self.assertEqual(self.ui.popup.list_widget.count(), 22)
         self.ui.popup.list_widget.setCurrentRow(
             self.ui.popup.list_widget.count() - 5)
         current = self.ui.popup.list_widget.currentRow()
@@ -120,7 +120,7 @@
         self.ui.popup.setVisible(True)
         self.ui.temp_u1_files = self.ui.backend.search_files('')
         self.ui._load_items()
-        self.ui.popup.list_widget.setCurrentRow(1)
+        self.ui.popup.list_widget.setCurrentRow(3)
         current = self.ui.popup.list_widget.currentRow()
         self.ui.itemSelected.connect(self.fake_slot)
         self.ui._key_return_pressed(current)
@@ -132,7 +132,7 @@
         self.ui.temp_u1_files = self.ui.backend.search_files('')
         self.ui.popup.setVisible(True)
         self.ui._load_items()
-        self.ui.popup.list_widget.setCurrentRow(1)
+        self.ui.popup.list_widget.setCurrentRow(3)
         current = self.ui.popup.list_widget.currentItem()
         self.ui.itemSelected.connect(self.fake_slot)
         self.ui.popup.list_widget.itemPressed.emit(current)
@@ -150,29 +150,6 @@
         expected = (([],), {})
         self.assertEqual(expected, self._called)
 
-    def test_key_space_pressed(self):
-        """Check the proper actions are executed on key space pressed."""
-        data = []
-
-        def fake_set_text(text):
-            """fake setText."""
-            data.append(text)
-
-        self.patch(self.ui, "setText", fake_set_text)
-        self.ui.popup.setVisible(True)
-        self.ui.temp_u1_files = self.ui.backend.search_files('')
-        self.ui._load_items()
-        self.ui.popup.list_widget.setCurrentRow(2)
-
-        self.ui._key_space_pressed()
-        expected = [os.path.basename(self.files[2])]
-        self.assertEqual(expected, data)
-
-    def test_key_space_pressed_without_selection(self):
-        """Check the proper actions are executed on key space pressed."""
-        self.ui.popup.list_widget.setCurrentItem(None)
-        self.assertFalse(self.ui._key_space_pressed())
-
     def test_process_volumes_info(self):
         """Check that _process_volumes_info obtain the proper info."""
         self.ui.temp_u1_files = self.ui.backend.search_files('')
@@ -182,7 +159,7 @@
         expected = self.files
         expected.sort()
         self.assertEqual(self.ui.temp_u1_files, expected)
-        self.assertEqual(self.ui.popup.list_widget.count(), 6)
+        self.assertEqual(self.ui.popup.list_widget.count(), 8)
 
     def test_filter(self):
         """Check the results of the filter."""
@@ -212,7 +189,7 @@
         self.patch(self.ui.popup, "isVisible", lambda: True)
         self.ui.temp_u1_files = self.ui.backend.search_files('')
         self.ui._load_items()
-        self.ui.popup.list_widget.setCurrentRow(0)
+        self.ui.popup.list_widget.setCurrentRow(2)
         item = self.ui.popup.list_widget.currentItem()
         self.ui._set_selected_item(item)
         self.assertEqual(self._called,
@@ -280,11 +257,11 @@
         ]
 
         self.assertEqual(self.ui.list_widget.count(), 0)
-        self.ui.load_items(items)
-        self.assertEqual(self.ui.list_widget.count(), 3)
+        self.ui.load_items(items, '')
+        self.assertEqual(self.ui.list_widget.count(), 5)
         # Check that we erase the list on reload
-        self.ui.load_items(items)
-        self.assertEqual(self.ui.list_widget.count(), 3)
+        self.ui.load_items(items, '')
+        self.assertEqual(self.ui.list_widget.count(), 5)
 
     def test_fetch_more(self):
         """Tests that the items are loaded properly."""
@@ -295,10 +272,10 @@
         ]
 
         self.assertEqual(self.ui.list_widget.count(), 0)
-        self.ui.load_items(items)
-        self.assertEqual(self.ui.list_widget.count(), 3)
+        self.ui.load_items(items, '')
+        self.assertEqual(self.ui.list_widget.count(), 5)
         self.ui.fetch_more(items)
-        self.assertEqual(self.ui.list_widget.count(), 6)
+        self.assertEqual(self.ui.list_widget.count(), 8)
 
     def test_repaint_items(self):
         """Check the style of the items change acording to the selection."""
@@ -308,10 +285,11 @@
             '/home/tester/file3',
         ]
 
-        self.ui.load_items(items)
-        current = self.ui.list_widget.item(0)
+        self.ui.load_items(items, '')
+        self.ui.list_widget.setCurrentRow(2)
+        current = self.ui.list_widget.item(2)
         widget = self.ui.list_widget.itemWidget(current)
-        next_ = self.ui.list_widget.item(1)
+        next_ = self.ui.list_widget.item(3)
         widget2 = self.ui.list_widget.itemWidget(next_)
         name = os.path.basename('/home/tester/file1')
         style = self.text_style.format(name, '/home/tester/file1',
@@ -322,10 +300,10 @@
         self.assertEqual(widget.text(), style)
         self.assertEqual(widget2.text(), style2)
 
-        self.ui.list_widget.setCurrentRow(1)
-        current = self.ui.list_widget.item(1)
+        self.ui.list_widget.setCurrentRow(3)
+        current = self.ui.list_widget.item(3)
         widget = self.ui.list_widget.itemWidget(current)
-        previous = self.ui.list_widget.item(0)
+        previous = self.ui.list_widget.item(2)
         widget2 = self.ui.list_widget.itemWidget(previous)
         name = os.path.basename('/home/tester/file2')
         style = self.text_style.format(name, '/home/tester/file2',
@@ -335,3 +313,31 @@
             '#333333', 'grey')
         self.assertEqual(widget.text(), style)
         self.assertEqual(widget2.text(), style2)
+
+    def test_first_list_item(self):
+        """Check that the first item in the popup has the proper string."""
+        self.ui.load_items([], 'file')
+        current = self.ui.list_widget.item(0)
+        text = current.text()
+        expected = gui.SEARCH_FOR % 'file'
+        self.assertEqual(expected, text)
+
+    def test_second_list_item_for_empty_list(self):
+        """Check that the second item in the popup has the proper string."""
+        self.ui.load_items([], 'file')
+        current = self.ui.list_widget.item(1)
+        text = current.text()
+        self.assertEqual(gui.NO_RESULTS, text)
+
+    def test_second_list_item(self):
+        """Check that the second item in the popup has the proper string."""
+        items = [
+            '/home/tester/file1',
+            '/home/tester/file2',
+            '/home/tester/file3',
+        ]
+
+        self.ui.load_items(items, 'file')
+        current = self.ui.list_widget.item(1)
+        text = current.text()
+        self.assertEqual(gui.SHARE_THESE_FILES, text)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_start.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-06-28 05:32:24 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-12-07 15:05:43 +0000
@@ -36,6 +36,7 @@
     def __init__(self):
         self.args = []
         self.updates_checked = defer.Deferred()
+        self.app = None
 
     def __call__(self, *args, **kwargs):
         self.args.append((args, kwargs))
@@ -57,6 +58,10 @@
         self.updates_checked.callback(None)
         return self.updates_checked
 
+    def connect_app_signal(self, app):
+        """Fake connect_app_signal."""
+        self.app = app
+
 
 class StartTestCase(TestCase):
     """Test the qt control panel."""
@@ -124,3 +129,9 @@
         # a timeout in this test means that the check_updates method
         # was not called
         yield self.main_window.updates_checked
+
+    def test_connect_app_signals_is_called(self):
+        """Check that connect_app_signal is properly called on start."""
+        gui.start(close_callback=self.close_cb)
+        app = gui.QtGui.QApplication.instance()
+        self.assertEqual(self.main_window.app, app)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-09-05 22:58:33 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-12-07 15:05:43 +0000
@@ -60,6 +60,11 @@
     def __init__(self, *args, **kwargs):
         self.args = (args, kwargs)
         super(FakeMainWindow, self).__init__()
+        self.tabname = ''
+
+    def switch_to(self, tabname):
+        """Fake switch_to."""
+        self.tabname = tabname
 
 
 class SystrayTestCase(BaseTestCase):
@@ -72,7 +77,6 @@
     def setUp(self):
         # We need to patch the startTimer first, to avoid the timer
         # to get started on initialization.
-        self.patch(systray.TrayIcon, "startTimer", lambda s, x: None)
         self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         yield super(SystrayTestCase, self).setUp()
         self.fake_desktop_service = FakeDesktopService()
@@ -249,6 +253,46 @@
         tray.open_u1.trigger()
         self.assertEqual(self._called, ((), {}))
 
+    def test_open_share_file_no_window(self):
+        """Test the open_share_file option in the menu, with no window."""
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
+        self.patch(ubuntuone.controlpanel.gui.qt.gui,
+            "MainWindow", FakeMainWindow)
+        tray = systray.TrayIcon()
+        self.assertEqual(tray.window, None)
+        tray.share_a_file.trigger()
+        self.assertIsInstance(tray.window, FakeMainWindow)
+        self.assertTrue(tray.window.isVisible())
+        self.assertEqual(tray.window.tabname, 'share_links')
+        self.assertEqual(tray.window.args, ((),
+            {'close_callback': tray.delete_window}))
+
+    def test_open_share_file(self):
+        """Test the open_share_file option in the menu, with a window."""
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
+        tray = systray.TrayIcon()
+        window = FakeMainWindow()
+        tray.window = window
+        self.assertFalse(tray.window.isVisible())
+        tray.share_a_file.trigger()
+        self.assertEqual(tray.window, window)
+        self.assertEqual(tray.window.tabname, 'share_links')
+        self.assertTrue(tray.window.isVisible())
+
+    def test_open_share_file_window_minimized(self):
+        """Test the open_share_file option in the menu, with a min. window."""
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
+        tray = systray.TrayIcon()
+        window = FakeMainWindow()
+        # This cannot be tested with the real activateWindow
+        # because the un-minimization is done by the WM, so
+        # it has a small delay, and it fails.
+        self.patch(window, "activateWindow", self._set_called)
+        tray.window = window
+        tray.share_a_file.trigger()
+        self.assertEqual(tray.window.tabname, 'share_links')
+        self.assertEqual(self._called, ((), {}))
+
     def test_delete_window(self):
         """Test deleting an existing window."""
         self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
@@ -337,7 +381,6 @@
     def setUp(self):
         # We need to patch the startTimer first, to avoid the timer
         # to get started on initialization.
-        self.patch(systray.TrayIcon, "startTimer", lambda s, x: None)
         self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         yield super(TransfersMenuTestCase, self).setUp()
         self.fake_desktop_service = FakeDesktopService()
@@ -531,58 +574,3 @@
         current_actions = self.ui.transfers.actions()
 
         self.assertNotEqual(previous_actions, current_actions)
-
-
-class SharesTestCase(BaseTestCase):
-
-    """Test the info to be displayed in the shares section."""
-
-    class_ui = systray.TrayIcon
-
-    @inlineCallbacks
-    def setUp(self):
-        # We need to patch the startTimer first, to avoid the timer
-        # to get started on initialization.
-        self.patch(systray.TrayIcon, "startTimer", lambda s, x: None)
-        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
-        yield super(SharesTestCase, self).setUp()
-        self.fake_desktop_service = FakeDesktopService()
-        self.patch(QtGui, "QDesktopServices", self.fake_desktop_service)
-        self.patch(self.ui.backend, "get_shares", self.fake_get_backend)
-        self._shares_info = []
-
-    def fake_get_backend(self):
-        """Fake get_backend."""
-        return self._shares_info
-
-    def test_shares_refresh_not_reload(self):
-        """Check that we get the new info of shares but not reload the menu."""
-        actions = self.ui.context_menu.actions()
-        self.ui.load_menu()
-        post_actions = self.ui.context_menu.actions()
-        self.assertEqual(actions, post_actions)
-
-    def test_shares_refresh_reload(self):
-        """Check that we get the new info of shares but not reload the menu."""
-        actions = self.ui.context_menu.actions()
-        self._shares_info = [
-            {'accepted': False, 'other_visible_name': 'name',
-            'volume_id': 'asd123-asd123-asd123-asd123'}
-        ]
-        self.ui.load_menu()
-        post_actions = self.ui.context_menu.actions()
-        self.assertNotEqual(actions, post_actions)
-
-    def test_share_triggered(self):
-        """Check that we get the new info of shares but not reload the menu."""
-        volume_id = 'asd123-asd123-asd123-asd123'
-        self._shares_info = [
-            {'accepted': False, 'other_visible_name': 'name',
-            'volume_id': volume_id}
-        ]
-        self.ui.load_menu()
-        actions = self.ui.context_menu.actions()
-        share_action = actions[7]
-        share_action.trigger()
-        expected = QtCore.QUrl(systray.ACCEPT_SHARES % volume_id)
-        self.assertEqual(self.fake_desktop_service.opened_url, expected)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_wizard.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_wizard.py	2012-03-29 19:05:02 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_wizard.py	2012-12-07 15:05:43 +0000
@@ -296,7 +296,7 @@
 
 
 class UbuntuOneWizardSettingsTestCase(UbuntuOneWizardSignInTestCase):
-    """Test the CloudToComputerPage wizard page."""
+    """Test the Settings wizard page."""
 
     buttons = {'BackButton': (None, 'currentIdChanged', (1,))}
     page_name = 'settings'
@@ -304,7 +304,7 @@
 
 
 class UbuntuOneWizardComputerToCloudTestCase(UbuntuOneWizardSignInTestCase):
-    """Test the CloudToComputerPage wizard page."""
+    """Test the ComputerToCloudPage wizard page."""
 
     buttons = {
         'FinishButton': (None, 'finished', (gui.QtGui.QDialog.Accepted,)),
@@ -354,6 +354,17 @@
     method = 'login'
 
     @defer.inlineCallbacks
+    def setUp(self):
+        yield super(UbuntuOneWizardLoginTestCase, self).setUp()
+        self.connect_files_called = False
+
+        def fake_connect_files():
+            self.connect_files_called = True
+
+        self.patch(self.ui.backend, 'connect_files',
+                   fake_connect_files)
+
+    @defer.inlineCallbacks
     def test_with_credentials(self):
         """Wizard is done when credentials were retrieved."""
         self.ui.currentIdChanged.connect(self._set_called)
@@ -370,7 +381,7 @@
         button.click()
 
         yield d
-
+        self.assertEqual(True, self.connect_files_called)
         self.assertTrue(self.ui.signin_page.isEnabled())
         expected_next_id = self.ui.pages[self.ui.cloud_folders_page]
         self.assertEqual(self._called, ((expected_next_id,), {}))
@@ -392,7 +403,7 @@
         button.click()
 
         yield d
-
+        self.assertEqual(False, self.connect_files_called)
         self.assertTrue(self.ui.signin_page.isEnabled())
         self.assertFalse(self._called)
 
@@ -413,7 +424,7 @@
         button.click()
 
         yield d
-
+        self.assertEqual(False, self.connect_files_called)
         self.assertTrue(self.ui.signin_page.isEnabled())
         self.assertFalse(self._called)  # the wizard page was not changed
 

=== modified file 'ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py	2012-04-24 17:59:49 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/__init__.py	2012-12-07 15:05:43 +0000
@@ -20,15 +20,31 @@
 
 from PyQt4 import QtNetwork, QtGui, QtCore
 
+from ubuntuone.controlpanel.logger import setup_logging
+
+
+logger = setup_logging('uniqueapp')
+
+# Arg with valid value
+SOCKET_MESSAGES = {
+    '--switch-to': ["folders", "share_links", "devices",
+                    "settings", "account"],
+}
+
 
 class UniqueApplication(QtGui.QApplication):
 
     """A dummy UniqueApplication class."""
 
     new_instance = QtCore.pyqtSignal()
+    switch_to = QtCore.pyqtSignal(unicode)
+    activate_window = QtCore.pyqtSignal()
 
     def __init__(self, argv, key):
         super(UniqueApplication, self).__init__(argv)
+        self.mapping_signals = {
+            '--switch-to': self.switch_to,
+        }
         self.key = key
         self.server = QtNetwork.QLocalServer(self)
         self.server.newConnection.connect(self.new_instance.emit)
@@ -38,11 +54,51 @@
         socket.connectToServer(key, QtCore.QIODevice.WriteOnly)
         if socket.waitForConnected(500):
             # Connected, exit
+            self._send_messages(socket, argv)
             sys.exit()
 
         # Not connected, start server
+        self.cleanup()
         self.ready = self.server.listen(key)
+        if not self.ready:
+            logger.debug(self.server.errorString())
+        self.server.newConnection.connect(self._process_messages)
 
     def cleanup(self):
         """Remove the socket when we die."""
         self.server.removeServer(self.key)
+
+    def _send_messages(self, socket, argv):
+        """Send messages to the running application."""
+        # This only take care of those args that are defined in SOCKET_MESSAGES
+        # at this moment just "--switch-to", sending a message to the already
+        # running client with: "arg=arg_value". If we have more than a single
+        # arg, each arg is concatenated with "|".
+        try:
+            data = []
+            size_argv = len(argv)
+            for index in range(2, size_argv):
+                if (argv[index] in SOCKET_MESSAGES and index < size_argv and
+                   argv[index + 1] in SOCKET_MESSAGES[argv[index]]):
+                    data.append('%s=%s' % (argv[index], argv[index + 1]))
+            message = '|'.join(data)
+            socket.write(message)
+            socket.flush()
+            socket.close()
+        except:
+            # The message couldn't be send through the socket,
+            # but we avoided to open multiple instances of control panel.
+            pass
+
+    def _process_messages(self):
+        """Get the messages from the other instances."""
+        connection = self.server.nextPendingConnection()
+        connection.waitForReadyRead()
+        data = unicode(connection.readAll()).split('|')
+        connection.close()
+        for item in data:
+            item_value = item.split('=')
+            signal = self.mapping_signals.get(item_value[0])
+            if signal:
+                signal.emit(item_value[1])
+        self.activate_window.emit()

=== modified file 'ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_unique_app.py'
--- ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_unique_app.py	2012-04-24 17:59:49 +0000
+++ ubuntuone/controlpanel/gui/qt/uniqueapp/tests/test_unique_app.py	2012-12-07 15:05:43 +0000
@@ -19,9 +19,9 @@
 from PyQt4 import QtCore
 from twisted.internet.defer import inlineCallbacks
 
+from ubuntuone.controlpanel.gui.tests import FakeSignal
 from ubuntuone.controlpanel.gui.qt import uniqueapp
 from ubuntuone.controlpanel.tests import TestCase
-from ubuntuone.controlpanel.gui.tests import FakeSignal
 
 
 #pylint: disable=C0103
@@ -32,6 +32,7 @@
         self.connect_calls = []
         self.connect_timeouts = []
         self.connect_succeeds = True
+        self.message = None
 
     def connectToServer(self, *args, **kwargs):
         """Fake connectToServer."""
@@ -42,18 +43,51 @@
         self.connect_timeouts.append(timeout)
         return self.connect_succeeds
 
+    def write(self, message):
+        """Fake write."""
+        self.message = message
+
+    def flush(self):
+        """Fake flush."""
+
+    def close(self):
+        """Fake close."""
+
+    def waitForReadyRead(self):
+        """Fake waitForReadyRead."""
+
+    def readAll(self):
+        """Fake readAll: return the message."""
+        return self.message
+
 
 class FakeLocalServer(object):
 
     """A fake QLocalServer."""
 
-    def __init__(self):
+    def __init__(self, connected=True):
         self.newConnection = FakeSignal()
         self.listen_args = []
+        self.socket = None
+        self._removed_key = None
+        self._is_connected = connected
 
     def listen(self, *args, **kwargs):
         """Fake listen."""
         self.listen_args.append((args, kwargs))
+        return self._is_connected
+
+    def nextPendingConnection(self):
+        """Fake nextPendingConnection."""
+        return self.socket
+
+    def removeServer(self, key):
+        """Fake removeServer."""
+        self._removed_key = key
+
+    def errorString(self):
+        """Fake errorString."""
+        return 'error'
 
 
 class FakeApplication(object):
@@ -77,6 +111,21 @@
         self.patch(uniqueapp.UniqueApplication, "aboutToQuit", self.fake_quit)
         self.patch(uniqueapp.QtGui, "QApplication", FakeApplication)
 
+    def test_cleanup_called_on_init(self):
+        """Check that cleanup is called on initialization."""
+        uniapp = uniqueapp.UniqueApplication([], "key")
+        self.assertEqual("key", uniapp.server._removed_key)
+
+    def test_on_failed_connection(self):
+        """Check the flow of the program on connection fail."""
+        data = []
+        local_server = FakeLocalServer(False)
+        self.patch(uniqueapp.QtNetwork, "QLocalServer",
+            lambda parent: local_server)
+        self.patch(uniqueapp.logger, "debug", data.append)
+        uniqueapp.UniqueApplication([], "key")
+        self.assertEqual(data, ['error'])
+
     def test_client_socket(self):
         """Check that the client socket is used correctly."""
         self.local_socket.connect_succeeds = True
@@ -105,10 +154,56 @@
         app = uniqueapp.UniqueApplication([], "key")
         # Yes, this is ugly. I can't find any other meaningful
         # way to compare them though.
-        self.assertEqual(str(app.server.newConnection.target.__self__),
+        self.assertEqual(str(app.server.newConnection.target[0].__self__),
             str(app.new_instance))
+        self.assertEqual(app.server.newConnection.target[1],
+            app._process_messages)
 
     def test_cleanup(self):
         """Check that cleanup is called with the right key."""
         app = uniqueapp.UniqueApplication([], "key")
-        self.assertEqual(self.fake_quit.target, app.cleanup)
+        self.assertEqual(self.fake_quit.target, [app.cleanup])
+
+    def test_send_messages_valid(self):
+        """Check the message is created correctly."""
+        self.local_socket.connect_succeeds = True
+        argv = ['python', 'ubuntuone-control-panel-qt',
+            '--switch-to', 'share_links']
+        uniqueapp.UniqueApplication(argv, "key")
+        expected = "--switch-to=share_links"
+        self.assertEqual(self.local_socket.message, expected)
+
+    def test_send_messages_invalid(self):
+        """Check the message is created correctly."""
+        self.local_socket.connect_succeeds = True
+        argv = ['python', 'ubuntuone-control-panel-qt']
+        uniqueapp.UniqueApplication(argv, "key")
+        expected = ""
+        self.assertEqual(self.local_socket.message, expected)
+
+    def test_process_message_with_message(self):
+        """Check that we are able to parse the message received."""
+        data = []
+        self.local_socket.connect_succeeds = True
+        argv = ['python', 'ubuntuone-control-panel-qt',
+            '--switch-to', 'share_links']
+        app = uniqueapp.UniqueApplication(argv, "key")
+        self.local_server.socket = self.local_socket
+        app.switch_to.connect(data.append)
+        app.activate_window.connect(lambda: data.append(True))
+
+        app.server.newConnection.emit()
+        self.assertEqual(data, ["share_links", True])
+
+    def test_process_message_no_message(self):
+        """Check that we are able to parse the message received."""
+        data = []
+        self.local_socket.connect_succeeds = True
+        argv = ['python', 'ubuntuone-control-panel-qt']
+        app = uniqueapp.UniqueApplication(argv, "key")
+        self.local_server.socket = self.local_socket
+        app.switch_to.connect(data.append)
+        app.activate_window.connect(lambda: data.append(True))
+
+        app.server.newConnection.emit()
+        self.assertEqual(data, [True])

=== modified file 'ubuntuone/controlpanel/gui/qt/wizard.py'
--- ubuntuone/controlpanel/gui/qt/wizard.py	2012-03-29 19:05:02 +0000
+++ ubuntuone/controlpanel/gui/qt/wizard.py	2012-12-07 15:05:43 +0000
@@ -68,9 +68,9 @@
         <p>{license_link}</p>
     </body>
 <html>""".format(license_agreement=LICENSE_AGREEMENT,
-    license_gpl3=LICENSE_GPL3, license_basic=LICENSE_BASIC,
-    license_link=LICENSE_LINK.format(license_link=GPL_LINK),
-)
+                 license_gpl3=LICENSE_GPL3, license_basic=LICENSE_BASIC,
+                 license_link=LICENSE_LINK.format(license_link=GPL_LINK),
+                 )
 
 
 class AreYouSure(QtGui.QDialog):
@@ -298,6 +298,10 @@
     def _process_credentials(self, credentials=None):
         """Confirm which is the next step after analyzing 'credentials'."""
         if credentials:
+            # NOTE: we don't check the autoconnect key here because we
+            # do need the connection for the initial remote volumes
+            # list, and it is on by default anyway.
+            self.backend.connect_files()
             self.next()
 
     @QtCore.pyqtSlot()

=== modified file 'ubuntuone/controlpanel/gui/tests/__init__.py'
--- ubuntuone/controlpanel/gui/tests/__init__.py	2012-04-24 17:59:49 +0000
+++ ubuntuone/controlpanel/gui/tests/__init__.py	2012-12-07 15:05:43 +0000
@@ -91,12 +91,12 @@
      [{u'volume_id': u'0', u'name': u'full', u'path': u'full-share',
        u'subscribed': u'', u'type': ControlBackend.SHARE_TYPE,
        u'display_name': u'something',
-      }]),
+       }]),
     (u'Almost no free space', gui.SHARES_MIN_SIZE_FULL - 1,
      [{u'volume_id': u'1', u'name': u'almostfull', u'path': u'almost-full',
        u'subscribed': u'', u'type': ControlBackend.SHARE_TYPE,
        u'display_name': u'yadda',
-      }]),
+       }]),
 ]
 
 FAKE_VOLUMES_ONLY_ROOT_INFO = [(u'', u'5368709120', [ROOT])]
@@ -185,17 +185,17 @@
 
     def __init__(self, *args, **kwargs):
         """Initialize."""
-        self.target = None
+        self.target = []
 
     def connect(self, target):
         """Fake connect."""
-        self.target = target
+        self.target.append(target)
 
     def disconnect(self, *args):
         """Fake disconnect."""
-        self.target = None
+        self.target = []
 
     def emit(self, *args):
         """Fake emit."""
-        if self.target:
-            self.target(*args)
+        for target in self.target:
+            target(*args)

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2012-10-29 16:02:46 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2012-12-07 15:05:43 +0000
@@ -16,13 +16,12 @@
 
 """Tests for the control panel backend."""
 
+import json
 import operator
 import os
 
 from collections import defaultdict
 
-import simplejson
-
 from twisted.internet import defer
 from twisted.internet.defer import inlineCallbacks, returnValue
 from ubuntuone.devtools.handlers import MementoHandler
@@ -43,7 +42,8 @@
     UBUNTUONE_FROM_OAUTH,
     UBUNTUONE_LINK,
 )
-from ubuntuone.controlpanel.tests import (TestCase,
+from ubuntuone.controlpanel.tests import (
+    TestCase,
     EMPTY_DESCRIPTION_JSON,
     EXPECTED_ACCOUNT_INFO,
     EXPECTED_ACCOUNT_INFO_WITH_CURRENT_PLAN,
@@ -106,7 +106,7 @@
         elif self.failure:
             return defer.fail(backend.WebClientError(self.failure))
         else:
-            result = simplejson.loads(self.results[method])
+            result = json.loads(self.results[method])
             return defer.succeed(result)
 
     @defer.inlineCallbacks
@@ -1485,6 +1485,32 @@
         self.assertEqual(self.call_count_b, 1)
         self.assertEqual(self.call_count_a, 1)
 
+    def test_remove_status_handler(self):
+        """Test removing a handler."""
+        self.call_count_a = 0
+        self.call_count_b = 0
+
+        def inc_a(status):
+            """Fake status handler #1"""
+            self.call_count_a += 1
+
+        def inc_b(status):
+            """Fake status handler #2"""
+            self.call_count_b += 1
+
+        self.addCleanup(delattr, self, "call_count_a")
+        self.addCleanup(delattr, self, "call_count_b")
+
+        self.be.add_status_changed_handler(inc_a)
+        self.be.add_status_changed_handler(inc_b)
+
+        self.be.sd_client.status_changed_handler({})
+        self.be.remove_status_changed_handler(inc_b)
+        self.be.sd_client.status_changed_handler({})
+
+        self.assertEqual(self.call_count_b, 1)
+        self.assertEqual(self.call_count_a, 2)
+
 
 class BackendSyncStatusIfDisabledTestCase(BackendSyncStatusTestCase):
     """Syncdaemon state for the backend when file sync is disabled."""

=== modified file 'ubuntuone/controlpanel/utils/darwin.py'
--- ubuntuone/controlpanel/utils/darwin.py	2012-10-17 17:28:43 +0000
+++ ubuntuone/controlpanel/utils/darwin.py	2012-12-07 15:05:43 +0000
@@ -395,8 +395,8 @@
 
     authRef = get_authorization()
 
-    if (installed_version is not None and
-        installed_version < bundled_version):
+    if installed_version is not None and \
+            installed_version < bundled_version:
         logger.info("Found installed daemon version %r < %r, removing." %
                     (installed_version, bundled_version))
 

=== modified file 'ubuntuone/controlpanel/web_client.py'
--- ubuntuone/controlpanel/web_client.py	2012-10-23 19:26:30 +0000
+++ ubuntuone/controlpanel/web_client.py	2012-12-07 15:05:43 +0000
@@ -16,7 +16,7 @@
 
 """The web client."""
 
-import simplejson
+import json
 
 from twisted.internet import defer
 from ubuntu_sso.utils.webclient import webclient_factory
@@ -48,7 +48,7 @@
         credentials = yield self.get_credentials()
         response = yield self.wc.request(iri, extra_headers=extra_headers,
                                      oauth_credentials=credentials)
-        result = simplejson.loads(response.content)
+        result = json.loads(response.content)
         defer.returnValue(result)
 
     @defer.inlineCallbacks