Merge lp:~dobey/ubuntuone-installer/launch-cp into lp:ubuntuone-installer

[dobey]

Launch the control-panel straight away if already installed

[Eric Casteleijn (thisfred)]

review: Approve

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'bin/ubuntuone-installer'
--- bin/ubuntuone-installer	2011-07-29 14:31:29 +0000
+++ bin/ubuntuone-installer	2011-08-04 18:29:24 +0000
@@ -16,11 +16,22 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """The main script for the Ubuntu One Installer."""
 
-from gi.repository import Gtk
-
-
+import apt
+
+from gi.repository import Gtk, GLib
+
+
+def is_installed(package):
+    """Check if things are installed already."""
+    cache = apt.Cache()
+    return package in cache and cache[package].is_installed
+
+    
 if __name__ == "__main__":
-    from ubuntuone.installer.gui import Window
-    dialog = Window()
-    dialog.run()
-    Gtk.main()
+    if is_installed('ubuntuone-control-panel-gtk'):
+        GLib.spawn_command_line_async('ubuntuone-control-panel-gtk')
+    else:
+        from ubuntuone.installer.gui import Window
+        dialog = Window()
+        dialog.run()
+        Gtk.main()