Merge lp:~3v1n0/ubuntuone-client/sync-menu-use-gappinfo-launch-4.2 into lp:ubuntuone-client/stable-4-2

[Marco Trevisan (Treviño)]

UbuntuOneSyncMenuLinux: use GAppInfo with proper context to launch URIs

This allows to correctly open the application with proper startup notify.

Backport of lp:~3v1n0/ubuntuone-client/sync-menu-use-gappinfo-launch to 4.2 stable branch.

[lp:~3v1n0/ubuntuone-client/sync-menu-use-gappinfo-launch-4.2]

1368. By Marco Trevisan (Treviño) on 2013-04-12

UbuntuOneSyncMenuLinux: protect the commandline-app-creation from error too

[Diego Sarmentero (diegosarmentero)]

Tests are failing, and there isn't new tests for the new code.

review: Needs Fixing

[dobey (dobey)]

I'm just rejecting this, because it's not necessary to have to deal with 2 proposals at the moment. Only the branch against truck is needed for this, as there's no conflicting difference between it and stable-4-2 that would break this branch.

review: Disapprove

[lp:~3v1n0/ubuntuone-client/sync-menu-use-gappinfo-launch-4.2]

1369. By Marco Trevisan (Treviño) on 2013-04-16

UbuntuOneSyncMenuLinux: merge with trunk branch changes

Unmerged revisions

1369. By Marco Trevisan (Treviño) on 2013-04-16

UbuntuOneSyncMenuLinux: merge with trunk branch changes

1368. By Marco Trevisan (Treviño) on 2013-04-12

UbuntuOneSyncMenuLinux: protect the commandline-app-creation from error too

1367. By Marco Trevisan (Treviño) on 2013-04-12

UbuntuOneSyncMenuLinux: use GAppInfo with proper context to launch URIs

This allows to correctly open the application with proper startup notify.

=== modified file 'ubuntuone/platform/sync_menu/linux.py'
--- ubuntuone/platform/sync_menu/linux.py	2013-02-20 22:41:12 +0000
+++ ubuntuone/platform/sync_menu/linux.py	2013-04-12 12:36:39 +0000
@@ -31,7 +31,6 @@
 import gettext
 import logging
 import time
-import webbrowser
 from twisted.python.util import OrderedDict
 from operator import itemgetter
 
@@ -39,6 +38,8 @@
     from gi.repository import GLib as glib
     from gi.repository import (
         Dbusmenu,
+        Gdk,
+        Gio,
         SyncMenu,
     )
     use_syncmenu = True
@@ -69,6 +70,9 @@
 DASHBOARD = UBUNTUONE_LINK + u'dashboard/'
 HELP_LINK = UBUNTUONE_LINK + u'support/'
 GET_STORAGE_LINK = UBUNTUONE_LINK + u'services/add-storage/'
+CLIENT_COMMAND_LINE = 'ubuntuone-control-panel-qt'
+CLIENT_DESKTOP_ID = 'ubuntuone-control-panel-qt-gnome.desktop'
+INSTALLER_DESKTOP_ID = 'ubuntuone-installer.desktop'
 
 
 class UbuntuOneSyncMenuLinux(object):
@@ -133,7 +137,7 @@
 
         self.server = Dbusmenu.Server()
         self.server.set_root(self.root_menu)
-        self.app = SyncMenu.App.new("ubuntuone-installer.desktop")
+        self.app = SyncMenu.App.new(INSTALLER_DESKTOP_ID)
         self.app.set_menu(self.server)
         self.app.connect("notify::paused", self.change_sync_status)
 
@@ -155,36 +159,65 @@
             self._syncdaemon_service.connect()
             self._connected = True
 
-    def open_control_panel(self, *args):
+    def _get_launch_context(self, timestamp):
+        """Returns the launch context for the current display"""
+        context = Gdk.Display.get_default().get_app_launch_context()
+        context.set_timestamp(timestamp)
+        return context
+
+    def _open_uri(self, uri, timestamp = 0):
+        """Open an uri Using the default handler and the action timestamp"""
+        try:
+            Gio.AppInfo.launch_default_for_uri(uri, self._get_launch_context(timestamp))
+        except glib.GError as e:
+            logger.warning('Failed to open the uri %s: %s.' % (uri, e))
+
+    def _open_control_panel_by_command_line(self, timestamp, args = ''):
+        """Open the control panel by command line"""
+        flags = Gio.AppInfoCreateFlags.SUPPORTS_STARTUP_NOTIFICATION
+        command_line = CLIENT_COMMAND_LINE
+        if len(args):
+            command_line += ' ' + args
+
+        try:
+            app = Gio.AppInfo.create_from_commandline(command_line, 'Ubuntu One', flags)
+
+            if app:
+                app.launch([], self._get_launch_context(timestamp))
+        except glib.GError as e:
+            logger.warning('Failed to open the control panel: %s.' % e)
+
+    def open_control_panel(self, menuitem, timestamp):
         """Open the Ubuntu One Control Panel."""
-        try:
-            glib.spawn_command_line_async('ubuntuone-control-panel-qt')
-        except glib.GError as e:
-            logger.warning('Failed to open the control panel: %s.' % e)
-
-    def open_ubuntu_one_folder(self, *args):
+        app = Gio.DesktopAppInfo.new(CLIENT_DESKTOP_ID)
+
+        if app:
+            try:
+                app.launch([], self._get_launch_context(timestamp))
+            except glib.GError as e:
+                logger.warning('Failed to open the control panel: %s.' % e)
+        else:
+            self._open_control_panel_by_command_line(timestamp)
+
+    def open_ubuntu_one_folder(self, menuitem, timestamp):
         """Open the Ubuntu One folder."""
-        webbrowser.open(self._syncdaemon_service.get_rootdir())
+        self._open_uri("file://" + self._syncdaemon_service.get_rootdir(), timestamp)
 
-    def open_share_file_tab(self, *args):
+    def open_share_file_tab(self, menuitem, timestamp):
         """Open the Control Panel in the Share Tab."""
-        try:
-            glib.spawn_command_line_async('ubuntuone-control-panel-qt '
-                '--switch-to share_links')
-        except glib.GError as e:
-            logger.warning('Failed to open the control panel: %s.' % e)
-
-    def open_go_to_web(self, *args):
-        """Open the Ubunto One Help Page"""
-        webbrowser.open(DASHBOARD)
-
-    def open_web_help(self, *args):
-        """Open the Ubunto One Help Page"""
-        webbrowser.open(HELP_LINK)
-
-    def open_get_more_storage(self, *args):
-        """Open the Ubunto One Help Page"""
-        webbrowser.open(GET_STORAGE_LINK)
+        self._open_control_panel_by_command_line(timestamp, "--switch-to share_links")
+
+    def open_go_to_web(self, menuitem, timestamp):
+        """Open the Ubuntu One Help Page"""
+        self._open_uri(DASHBOARD, timestamp)
+
+    def open_web_help(self, menuitem, timestamp):
+        """Open the Ubuntu One Help Page"""
+        self._open_uri(HELP_LINK, timestamp)
+
+    def open_get_more_storage(self, menuitem, timestamp):
+        """Open the Ubuntu One Help Page"""
+        self._open_uri(GET_STORAGE_LINK, timestamp)
 
     def _timeout(self, result):
         """The aggregating timer has expired, so update the UI."""
@@ -284,3 +317,4 @@
     UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux
 else:
     UbuntuOneSyncMenu = DummySyncMenu
+