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

Proposed by Manuel de la Peña
Status: Merged
Approved by: John Lenton
Approved revision: 179
Merged at revision: 137
Proposed branch: lp:~mandel/ubuntuone-windows-installer/open_preferences_after_adding_machine
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/smart_context_menu
Diff against target: 71 lines (+44/-7) (has conflicts)
1 file modified
src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs (+44/-7)
Text conflict in src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/open_preferences_after_adding_machine
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+40820@code.launchpad.net

Description of the change

Open preferences after adding the machine.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
2--- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs 2010-11-14 22:48:11 +0000
3+++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs 2010-11-14 22:48:12 +0000
4@@ -239,16 +239,17 @@
5 {
6 // we got credentials, no matter what we tell the ui to be ready
7 NotificationIconView.ViewDispatcher.Dispatch(() => NotificationIconView.ShowAsAddedComputer(true));
8- // check if the credentials are for us);
9- if (args.ApplicationName != ManualSyncEvent) return;
10+ // check if the credentials are for us
11+<<<<<<< TREE
12+ if (args.ApplicationName != EventName) return;
13 NotificationIconView.ViewDispatcher.Dispatch(
14 () =>
15- {
16- NotificationIconView.IsManualSyncEnabled = false;
17- NotificationIconView.State = "Syncing";
18- }
19+ {
20+ NotificationIconView.IsManualSyncEnabled = false;
21+ NotificationIconView.State = "Syncing";
22+ }
23 );
24-
25+
26 Logger.Info("Got the UbuntuOne credentials!");
27 var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
28 Resources.DefaulDirectoryName);
29@@ -267,6 +268,42 @@
30 NotificationIconView.State = "Synced";
31 }
32 );
33+=======
34+ if (args.ApplicationName == ManualSyncEvent)
35+ {
36+ NotificationIconView.ViewDispatcher.Dispatch(
37+ () =>
38+ {
39+ NotificationIconView.IsManualSyncEnabled = false;
40+ NotificationIconView.State = "Syncing";
41+ }
42+ );
43+
44+ Logger.Info("Got the UbuntuOne credentials!");
45+ var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
46+ "UbuntuOne");
47+ // ensure that the path can be handled by the python code
48+ oneDir = oneDir.Replace("\\", "\\\\");
49+ SyncDaemon.ManualSync(
50+ oneDir,
51+ args.Credentials["Token"],
52+ args.Credentials["TokenSecret"],
53+ args.Credentials["ConsumerKey"],
54+ args.Credentials["ConsumerSecret"]);
55+ NotificationIconView.ViewDispatcher.Dispatch(
56+ () =>
57+ {
58+ NotificationIconView.IsManualSyncEnabled = true;
59+ NotificationIconView.State = "Synced";
60+ }
61+ );
62+ }// manual sync
63+ if(args.ApplicationName == AddComputerEvent)
64+ {
65+ // show the preferences since it is the first time we use the app
66+ PreferencesDialogPresenter.Show();
67+ }
68+>>>>>>> MERGE-SOURCE
69 }
70
71 [DebugLogged]

Subscribers

People subscribed via source and target branches

to all changes: