Merge lp:~mandel/ubuntuone-windows-installer/open_preferences_after_adding_machine into lp:ubuntuone-windows-installer/beta

[Manuel de la Peña]

Open preferences after adding the machine.

[John Lenton (chipaca)]

review: Approve

=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-11-14 22:48:11 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-11-14 22:48:12 +0000
@@ -239,16 +239,17 @@
         {
             // we got credentials, no matter what we tell the ui to be ready
             NotificationIconView.ViewDispatcher.Dispatch(() => NotificationIconView.ShowAsAddedComputer(true));
-            // check if the credentials are for us);
-            if (args.ApplicationName != ManualSyncEvent) return;
+            // check if the credentials are for us
+<<<<<<< TREE
+            if (args.ApplicationName != EventName) return;
             NotificationIconView.ViewDispatcher.Dispatch(
                 () =>
-                {
-                    NotificationIconView.IsManualSyncEnabled = false;
-                    NotificationIconView.State = "Syncing";
-                }
+                    {
+                        NotificationIconView.IsManualSyncEnabled = false;
+                        NotificationIconView.State = "Syncing";
+                    }
             );
-
+            
             Logger.Info("Got the UbuntuOne credentials!");
             var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
                                       Resources.DefaulDirectoryName);
@@ -267,6 +268,42 @@
                     NotificationIconView.State = "Synced";
                 }
             );
+=======
+            if (args.ApplicationName == ManualSyncEvent)
+            {
+                NotificationIconView.ViewDispatcher.Dispatch(
+                    () =>
+                        {
+                            NotificationIconView.IsManualSyncEnabled = false;
+                            NotificationIconView.State = "Syncing";
+                        }
+                    );
+
+                Logger.Info("Got the UbuntuOne credentials!");
+                var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
+                                          "UbuntuOne");
+                // ensure that the path can be handled by the python code
+                oneDir = oneDir.Replace("\\", "\\\\");
+                SyncDaemon.ManualSync(
+                    oneDir,
+                    args.Credentials["Token"],
+                    args.Credentials["TokenSecret"],
+                    args.Credentials["ConsumerKey"],
+                    args.Credentials["ConsumerSecret"]);
+                NotificationIconView.ViewDispatcher.Dispatch(
+                    () =>
+                        {
+                            NotificationIconView.IsManualSyncEnabled = true;
+                            NotificationIconView.State = "Synced";
+                        }
+                    );
+            }// manual sync
+            if(args.ApplicationName == AddComputerEvent)
+            {
+                // show the preferences since it is the first time we use the app
+                PreferencesDialogPresenter.Show();
+            }
+>>>>>>> MERGE-SOURCE
         }
 
         [DebugLogged]