Merge lp:~facundo/magicicada-client/changes-for-xenial into lp:magicicada-client

[Facundo Batista]

Better dependencies list and small fix in the code.

Better dependencies list and small fix in the code.

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'dependencies-devel.txt'
--- dependencies-devel.txt	2016-05-29 20:12:25 +0000
+++ dependencies-devel.txt	2016-07-13 22:18:54 +0000
@@ -1,6 +1,5 @@
 bzr
 make
-python-distutils-extra
 python-flake8
 python-mocker
 python-virtualenv
 
=== modified file 'dependencies.txt'
--- dependencies.txt	2016-05-29 20:12:25 +0000
+++ dependencies.txt	2016-07-13 22:18:54 +0000
@@ -2,6 +2,8 @@
 gir1.2-soup-2.4
 protobuf-compiler
 python-configglue
+python-dirspec
+python-distutils-extra
 python-gi
 python-httplib2
 python-protobuf
 
=== modified file 'ubuntuone/platform/launcher/linux.py'
--- ubuntuone/platform/launcher/linux.py	2016-05-29 00:50:05 +0000
+++ ubuntuone/platform/launcher/linux.py	2016-07-13 22:18:54 +0000
@@ -43,7 +43,8 @@
     """The launcher icon."""
 
     def __init__(self):
-        self.entry = Unity.LauncherEntry.get_for_desktop_id(U1_DOTDESKTOP)
+        self.entry = Unity.LauncherEntry.get_for_desktop_id(
+            CONTROLPANEL_DOTDESKTOP)
 
     def show_progressbar(self):
         """Show the progress bar."""