Merge lp:~brian.curtin/ubuntuone-control-panel/fix-windows-startup into lp:ubuntuone-control-panel

[Brian Curtin]

- Fix Windows autostart behavior to match that of what was used for the other shortcuts.

Fix Windows autostart behavior to match that of what was used for the other shortcuts. Remove syncdaemon from startup and remove the --minimized flag from controlpanel.

Unmerged revisions

302. By Brian Curtin on 2012-03-29

Remove SD and CP's --minimized from Windows startup

=== modified file 'ubuntuone/controlpanel/utils/tests/test_windows.py'
--- ubuntuone/controlpanel/utils/tests/test_windows.py	2012-03-23 21:20:18 +0000
+++ ubuntuone/controlpanel/utils/tests/test_windows.py	2012-03-29 14:00:28 +0000
@@ -161,11 +161,9 @@
         self.assertEqual(self.registry.query_args, None)
         path = os.path.dirname(os.path.abspath(sys.executable))
         self.assertEqual(self.registry.set_args,
-             [((self.registry.OpenKey, 'Ubuntu One', 0, 1,
-             '"%s\\ubuntuone-syncdaemon.exe"' % path), {}),
-             ((self.registry.OpenKey, 'Ubuntu One Icon', 0, 1,
-             '"%s\\ubuntuone-control-panel-qt.exe" --minimized' % path),
-             {})])
+             [((self.registry.OpenKey, 'Ubuntu One Icon', 0, 1,
+              '"%s\\ubuntuone-control-panel-qt.exe" --with-icon' % path),
+              {})])
 
     def test_not_added_if_not_frozen(self):
         """Not frozen binaries are not added to the registry."""

=== modified file 'ubuntuone/controlpanel/utils/windows.py'
--- ubuntuone/controlpanel/utils/windows.py	2012-03-23 21:48:53 +0000
+++ ubuntuone/controlpanel/utils/windows.py	2012-03-29 14:00:28 +0000
@@ -101,11 +101,8 @@
 
 
 def add_to_autostart():
-    """Add syncdaemon to the session's autostart."""
+    """Add controlpanel to the session's autostart."""
     if getattr(sys, "frozen", False):
-        sd_path = '"%s"' % os.path.join(os.path.dirname(
-            os.path.abspath(sys.executable)),
-            "ubuntuone-syncdaemon.exe")
         u1cp_path = '"%s"' % os.path.join(os.path.dirname(
             os.path.abspath(sys.executable)),
             "ubuntuone-control-panel-qt.exe")
@@ -113,6 +110,5 @@
         with _winreg.OpenKey(_winreg.HKEY_CURRENT_USER, AUTORUN_KEY,
                              0, _winreg.KEY_ALL_ACCESS) as key:
             # pylint: disable=E0602
-            _winreg.SetValueEx(key, "Ubuntu One", 0, _winreg.REG_SZ, sd_path)
             _winreg.SetValueEx(key, "Ubuntu One Icon", 0, _winreg.REG_SZ,
-                               u1cp_path + " --minimized --with-icon")
+                               u1cp_path + " --with-icon")