Merge lp:~ralsina/ubuntuone-windows-installer/quote_autostart into lp:ubuntuone-windows-installer

[Roberto Alsina]

Quote the paths for autostart.

This branch quotes the paths in the registry autostart, which was suggested by rye to be the fix for the bug.

I have never been able to reproduce it myself, so it needs a IRL test from either rye or elopio.

[dobey (dobey)]

review: Approve

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-11-30 17:09:12 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-12-08 13:48:24 +0000
@@ -204,9 +204,9 @@
         self.assertEqual(self.registry.query_args, None)
         self.assertEqual(self.registry.set_args,
              [(('KEY', 'Ubuntu One', 0, 1,
-             'C:\\Python27\\ubuntuone-syncdaemon.exe'), {}),
+             '"C:\\Python27\\ubuntuone-syncdaemon.exe"'), {}),
              (('KEY', 'Ubuntu One Icon', 0, 1,
-             'C:\\Python27\\ubuntuone-control-panel-qt.exe --minimized'),
+             '"C:\\Python27\\ubuntuone-control-panel-qt.exe" --minimized'),
              {})])
 
     def test_not_added_if_not_frozen(self):

=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py	2011-11-30 17:17:27 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py	2011-12-08 13:48:24 +0000
@@ -172,10 +172,10 @@
 def add_syncdaemon_to_autostart():
     """Add syncdaemon to the session's autostart."""
     if hasattr(sys, "frozen"):
-        sd_path = os.path.join(os.path.dirname(
+        sd_path = '"%s"' % os.path.join(os.path.dirname(
             os.path.abspath(sys.executable)),
             "ubuntuone-syncdaemon.exe")
-        u1cp_path = os.path.join(os.path.dirname(
+        u1cp_path = '"%s"' % os.path.join(os.path.dirname(
             os.path.abspath(sys.executable)),
             "ubuntuone-control-panel-qt.exe")
     else: