Merge lp:~nataliabidart/ubuntuone-windows-installer/stable-3-0-update-2.99.1 into lp:ubuntuone-windows-installer/stable-3-0

[Natalia Bidart]

[ Roberto Alsina <email address hidden> ]
  - Make UDF creation from the wizard work (LP: #904799).
  - Quote the paths for autostart (LP: #887715).

[Roberto Alsina (ralsina)]

+1 code and IRL

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-10-06 20:28:12 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2012-01-03 16:50:18 +0000
@@ -176,7 +176,7 @@
             self.wizard().currentIdChanged.disconnect(self.changed_page)
         except KeyError:
             pass
-        if page_id == self.wizard().SYNC_NOW_OR_LATER_PAGE:
+        if page_id == self.wizard().CONGRATULATIONS_PAGE:
             # The page following this one
             self.wizard().overlay.show()
             for path, item in self.items.items():

=== modified file 'ubuntuone_installer/gui/qt/tests/test_local_folders.py'
--- ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-11-07 20:18:58 +0000
+++ ubuntuone_installer/gui/qt/tests/test_local_folders.py	2012-01-03 16:50:18 +0000
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -482,7 +480,7 @@
         yield self.ui.get_info()
         show_counter = self.ui.wizard().overlay.show_counter
         hide_counter = self.ui.wizard().overlay.hide_counter
-        self.ui.changed_page(self.ui.wizard().SYNC_NOW_OR_LATER_PAGE)
+        self.ui.changed_page(self.ui.wizard().CONGRATULATIONS_PAGE)
         changes = sorted(self.ui.cp_backend.volume_setings_changes)
         self.assertEqual(changes,
             [('asdfgh', {'subscribed': True})])
@@ -503,7 +501,7 @@
         item.setCheckState(0, QtCore.Qt.Checked)
         item = yield self.ui.add_folder("whatever2")
         item.setCheckState(0, QtCore.Qt.Unchecked)
-        self.ui.changed_page(self.ui.wizard().SYNC_NOW_OR_LATER_PAGE)
+        self.ui.changed_page(self.ui.wizard().CONGRATULATIONS_PAGE)
         self.assertEqual(self.ui.cp_backend.folders_created,
             [('whatever',)])
         self.assertEqual(self.ui.wizard().overlay.show_counter,

=== 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	2012-01-03 16:50:18 +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	2012-01-03 16:50:18 +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: