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

[Manuel de la Peña]

Connects the UI with the currently developed sync.

[Rodrigo Moya (rodrigo-moya)]

review: Approve

[Stuart Colville (muffinresearch)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-08-30 09:37:56 +0000
+++ .bzrignore	2010-08-30 09:37:56 +0000
@@ -33,3 +33,5 @@
 src/Canonical.UbuntuOne.SyncDaemon/bin
 src/build
 src/dist
+utils/UbuntuOne.msi
+build.number
 
=== modified file 'install/UbuntuOne.wxs'
--- install/UbuntuOne.wxs	2010-08-30 09:37:56 +0000
+++ install/UbuntuOne.wxs	2010-08-30 09:37:56 +0000
@@ -902,6 +902,41 @@
 									      Source="build_results\u1sync\zope.interface._zope_interface_coptimizations.pyd" 
 									      KeyPath="yes"/>
 								</Component>
+                                <Directory Id="Vc90Dir"
+								       Name="Microsoft.VC90.CRT">
+                                    <Component Id="MicrosoftVC90CRTManifestComponent" 
+                                               Guid="46354fd0-b3ac-11df-8d81-0800200c9a66">
+                                        <File Id="Microsoft.VC90.CRT.manifest" 
+                                              Name="Microsoft.VC90.CRT.manifest" 
+                                              DiskId="1" 
+                                              Source="build_results\u1sync\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" 
+                                              KeyPath="yes"/>
+                                    </Component>
+                                    <Component Id="Msvcm90Component" 
+                                               Guid="ae81e760-b3ac-11df-8d81-0800200c9a66">
+                                        <File Id="msvcm90.dll" 
+                                              Name="msvcm90.dll" 
+                                              DiskId="1" 
+                                              Source="build_results\u1sync\Microsoft.VC90.CRT\msvcm90.dll" 
+                                              KeyPath="yes"/>
+                                    </Component>
+                                    <Component Id="Msvcp90Component" 
+                                               Guid="f7dbacc0-b3ac-11df-8d81-0800200c9a66">
+                                        <File Id="msvcp90.dll" 
+                                              Name="msvcp90.dll" 
+                                              DiskId="1" 
+                                              Source="build_results\u1sync\Microsoft.VC90.CRT\msvcp90.dll" 
+                                              KeyPath="yes"/>
+                                    </Component>
+                                    <Component Id="Msvcr90Component" 
+                                               Guid="e5e63e30-b3ad-11df-8d81-0800200c9a66">
+                                        <File Id="msvcr90.dll" 
+                                              Name="msvcr90.dll" 
+                                              DiskId="1" 
+                                              Source="build_results\u1sync\Microsoft.VC90.CRT\msvcr90.dll" 
+                                              KeyPath="yes"/>
+                                    </Component>
+                                </Directory>
                             </Directory>
 						</Directory>
 					</Directory>
@@ -1021,6 +1056,10 @@
             <ComponentRef Id="Win32WnetComponent" />
             <ComponentRef Id="ZLibComponent" />
             <ComponentRef Id="ZopeInterfaceComponent" />
+            <ComponentRef Id="MicrosoftVC90CRTManifestComponent" />
+            <ComponentRef Id="Msvcm90Component" />
+            <ComponentRef Id="Msvcp90Component" />
+            <ComponentRef Id="Msvcr90Component" />
 		</Feature>
 		
 		<!-- Provide the UI extensions to be used -->
 
=== modified file 'main.build'
--- main.build	2010-08-30 09:37:56 +0000
+++ main.build	2010-08-30 09:37:56 +0000
@@ -233,6 +233,12 @@
             </fileset>
         </copy>
         
+        <copy todir="${build_results}/u1sync/Microsoft.VC90.CRT" flatten="true">
+            <fileset basedir="src/dist/Microsoft.VC90.CRT">
+                <include name="*.*" />
+            </fileset>
+        </copy>
+        
 		<!-- copy the correct views lib -->
 		
 		<copy todir="${build_results}/Client" flatten="true">
 
=== modified file 'src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj'
--- src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-08-04 14:36:09 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Canonical.UbuntuOne.Client.Views.csproj	2010-08-30 09:37:56 +0000
@@ -80,6 +80,11 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Resources\Resources1.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="UbuntuOneMessageBox.cs" />
     <Compile Include="..\Version.cs">
       <Link>Properties\Version.cs</Link>
@@ -95,11 +100,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Resources\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="Update\DownloadingView.xaml.cs">
       <DependentUpon>DownloadingView.xaml</DependentUpon>
     </Compile>
@@ -113,6 +113,8 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\Resources.resx">
       <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources1.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
 
=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-07-27 16:07:04 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-08-30 09:37:56 +0000
@@ -31,9 +31,14 @@
     ShowActivated="False">
     <DockPanel>
         <StackPanel Margin="20">
-            <av:NotifyIcon Name="notifyIcon" Icon="/Canonical.UbuntuOne.Client.Views;component/Resources/ubuntu-logo-22x22.png" Text="Ubuntu One"> <!-- TODO: Add icon Icon="/AvalonLibraryTestPages;component/Properties/App.ico" Open preferences when click -->
+            <av:NotifyIcon Name="notifyIcon" Icon="/Canonical.UbuntuOne.Client.Views;component/Resources/ubuntu-logo-22x22.png" 
+                           Text="Ubuntu One"> <!-- TODO: Add icon Icon="/AvalonLibraryTestPages;component/Properties/App.ico" Open preferences when click -->
                 <FrameworkElement.ContextMenu>
                     <ContextMenu>
+                        <MenuItem x:Uid="UbuntuOneManualSync"  
+                                  Name="UbuntuOneManualSync" 
+                                  Header="{x:Static resx:Resources.UbuntuOneManualSync}" 
+                                  Click="OnUbuntuOneManualSyncClick"/>
                         <MenuItem x:Uid="UbuntuOnePreferencesMenuItem"  
                                   Name="UbuntuOnePreferencesMenuItem" 
                                   Header="{x:Static resx:Resources.UbuntuOnePreferences}" />
 
=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-08-05 08:15:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-08-30 09:37:56 +0000
@@ -17,6 +17,8 @@
 // Authors: Manuel de la Peña <[e-mail]>
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using Canonical.UbuntuOne.Client.Notification;
 
 namespace Canonical.UbuntuOne.Client.Views
@@ -74,5 +76,62 @@
         }
 
         #endregion
+
+        private void OnUbuntuOneManualSyncClick(object sender, System.Windows.RoutedEventArgs e)
+        {
+            // TODO: Used the bloddy presenter!!!!!
+            // TODO: This has to be fixed, we should not call the command directly, user the
+            // process dispatcher to prepare for the syncdaemon!!!!
+            // TODO: Do not hardcode the folder, use an object to store that
+            // TODO: Do not store oauth in the env vars!!!!
+            var oneDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), 
+                "UbuntuOne");
+            if(!Directory.Exists(oneDir))
+            {
+                Directory.CreateDirectory(oneDir);    
+            }
+
+            if(!Directory.Exists(Path.Combine(oneDir, ".ubuntuone-sync")))
+            {
+                // init the directory
+                var init = new Process
+                {
+                    StartInfo =
+                    {
+                        WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync",
+                        FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe",
+                        Arguments = String.Format(" --init {0} --oauth {1}",
+                            oneDir,
+                            Environment.GetEnvironmentVariable("UbuntuOne", EnvironmentVariableTarget.User)),
+                        UseShellExecute = false,
+                        RedirectStandardOutput = false,
+                        RedirectStandardError = false,
+                        CreateNoWindow = true,
+                        WindowStyle = ProcessWindowStyle.Hidden
+                    }
+                };
+                init.Start();
+                init.WaitForExit();
+                init.Close();
+            }
+
+            var proc = new Process
+            {
+                StartInfo =
+                {
+                    WorkingDirectory = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync",
+                    FileName = @"C:\Program Files\Canonical\UbuntuOne\Client\U1Sync\main.exe",
+                    Arguments = String.Format("{0} --oauth {1}",
+                        oneDir,
+                        Environment.GetEnvironmentVariable("UbuntuOne", EnvironmentVariableTarget.User)),
+                    UseShellExecute = false,
+                    RedirectStandardOutput = false,
+                    RedirectStandardError = false,
+                    CreateNoWindow = true,
+                    WindowStyle = ProcessWindowStyle.Hidden
+                }
+            };
+            proc.Start();
+        }
     }
 }
 
=== removed file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources.Designer.cs'
--- src/Canonical.UbuntuOne.Client.Views/Resources/Resources.Designer.cs	2010-07-29 17:19:47 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources.Designer.cs	1970-01-01 00:00:00 +0000
@@ -1,153 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.4927
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Canonical.UbuntuOne.Client.Views.Resources {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Canonical.UbuntuOne.Client.Views.Resources.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ubuntu One.
-        /// </summary>
-        public static string ApplicationName {
-            get {
-                return ResourceManager.GetString("ApplicationName", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Downloading updates....
-        /// </summary>
-        public static string DownloadingDialogTitle {
-            get {
-                return ResourceManager.GetString("DownloadingDialogTitle", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Exit.
-        /// </summary>
-        public static string Exit {
-            get {
-                return ResourceManager.GetString("Exit", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Get Help and Support....
-        /// </summary>
-        public static string Help {
-            get {
-                return ResourceManager.GetString("Help", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Get More Space.
-        /// </summary>
-        public static string MoreSpace {
-            get {
-                return ResourceManager.GetString("MoreSpace", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Open Share Folders.
-        /// </summary>
-        public static string OpenShares {
-            get {
-                return ResourceManager.GetString("OpenShares", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Open Sync Folders.
-        /// </summary>
-        public static string OpenSync {
-            get {
-                return ResourceManager.GetString("OpenSync", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Recently Modify Files.
-        /// </summary>
-        public static string RecentlyModifyFiles {
-            get {
-                return ResourceManager.GetString("RecentlyModifyFiles", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ubuntu One Preferences.
-        /// </summary>
-        public static string UbuntuOnePreferences {
-            get {
-                return ResourceManager.GetString("UbuntuOnePreferences", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Updating Ubuntu One....
-        /// </summary>
-        public static string UpdatingDialogTitle {
-            get {
-                return ResourceManager.GetString("UpdatingDialogTitle", resourceCulture);
-            }
-        }
-    }
-}
 
=== modified file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx'
--- src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx	2010-07-29 17:19:47 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources.resx	2010-08-30 09:37:56 +0000
@@ -141,6 +141,9 @@
   <data name="RecentlyModifyFiles" xml:space="preserve">
     <value>Recently Modify Files</value>
   </data>
+  <data name="UbuntuOneManualSync" xml:space="preserve">
+    <value>Synchronize Now</value>
+  </data>
   <data name="UbuntuOnePreferences" xml:space="preserve">
     <value>Ubuntu One Preferences</value>
   </data>
 
=== added file 'src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs'
--- src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs	1970-01-01 00:00:00 +0000
+++ src/Canonical.UbuntuOne.Client.Views/Resources/Resources1.Designer.cs	2010-08-30 09:37:56 +0000
@@ -0,0 +1,162 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.4952
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Canonical.UbuntuOne.Client.Views.Resources {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Canonical.UbuntuOne.Client.Views.Resources.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ubuntu One.
+        /// </summary>
+        public static string ApplicationName {
+            get {
+                return ResourceManager.GetString("ApplicationName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Downloading updates....
+        /// </summary>
+        public static string DownloadingDialogTitle {
+            get {
+                return ResourceManager.GetString("DownloadingDialogTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Exit.
+        /// </summary>
+        public static string Exit {
+            get {
+                return ResourceManager.GetString("Exit", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Get Help and Support....
+        /// </summary>
+        public static string Help {
+            get {
+                return ResourceManager.GetString("Help", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Get More Space.
+        /// </summary>
+        public static string MoreSpace {
+            get {
+                return ResourceManager.GetString("MoreSpace", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open Share Folders.
+        /// </summary>
+        public static string OpenShares {
+            get {
+                return ResourceManager.GetString("OpenShares", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Open Sync Folders.
+        /// </summary>
+        public static string OpenSync {
+            get {
+                return ResourceManager.GetString("OpenSync", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Recently Modify Files.
+        /// </summary>
+        public static string RecentlyModifyFiles {
+            get {
+                return ResourceManager.GetString("RecentlyModifyFiles", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Synchronize Now.
+        /// </summary>
+        public static string UbuntuOneManualSync {
+            get {
+                return ResourceManager.GetString("UbuntuOneManualSync", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Ubuntu One Preferences.
+        /// </summary>
+        public static string UbuntuOnePreferences {
+            get {
+                return ResourceManager.GetString("UbuntuOnePreferences", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Updating Ubuntu One....
+        /// </summary>
+        public static string UpdatingDialogTitle {
+            get {
+                return ResourceManager.GetString("UpdatingDialogTitle", resourceCulture);
+            }
+        }
+    }
+}
 
=== modified file 'src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs	2010-08-05 08:01:59 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/INotificationIconPresenter.cs	2010-08-30 09:37:56 +0000
@@ -24,6 +24,11 @@
     public interface INotificationIconPresenter
     {
         /// <summary>
+        /// When implemented this method should for the sync of the ubuntu one folder.
+        /// </summary>
+        void ManuelSync();
+
+        /// <summary>
         /// When implemented this method should open the Preferences window of Ubuntu One.
         /// </summary>
         void OpenUbuntuOnePreferences();
 
=== modified file 'src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs'
--- src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-08-05 08:01:59 +0000
+++ src/Canonical.UbuntuOne.Client/Notification/NotificationIconPresenter.cs	2010-08-30 09:37:56 +0000
@@ -16,6 +16,7 @@
 // 
 // Authors: Manuel de la Peña <[e-mail]>
 using System;
+using System.Diagnostics;
 using Canonical.UbuntuOne.Client.Preferences;
 using Canonical.UbuntuOne.Common.Aop;
 using Canonical.UbuntuOne.Common.Utils;
@@ -191,6 +192,15 @@
         #region Implementation of INotificationIconPresenter
 
         /// <summary>
+        /// When implemented this method should for the sync of the ubuntu one folder.
+        /// </summary>
+        public void ManuelSync()
+        {
+            throw new NotImplementedException();
+
+        }
+
+        /// <summary>
         /// Opens the Preferences window of Ubuntu One.
         /// </summary>
         public void OpenUbuntuOnePreferences()
 
=== modified file 'src/setup.py'
--- src/setup.py	2010-08-30 09:37:56 +0000
+++ src/setup.py	2010-08-30 09:37:56 +0000
@@ -3,6 +3,7 @@
 
 """ """
 import sys
+from glob import glob
 
 # ModuleFinder can't handle runtime changes to __path__, but win32com uses them
 try:
@@ -18,7 +19,7 @@
     import win32com
     for p in win32com.__path__[1:]:
         modulefinder.AddPackagePath("win32com", p)
-    for extra in ["win32com.shell"]: #,"win32com.mapi"
+    for extra in ["win32com.shell" ,"win32com.api"]: 
         __import__(extra)
         m = sys.modules[extra]
         for p in m.__path__[1:]:
@@ -26,7 +27,7 @@
 except ImportError:
     # no build path setup, no worries.
     pass
-
+  
 from distutils.core import setup
 import py2exe
 
@@ -44,6 +45,7 @@
         Ubuntu One is a suite of on-line
         services. This package contains the a synchronization client for the
         Ubuntu One file sharing service.""",
+        data_files = [("Microsoft.VC90.CRT", glob(r'C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\*.*'))],
         license='GPLv3',
         console=['u1sync\\main.py'],
         requires=[
 
=== modified file 'src/u1sync/main.py'
--- src/u1sync/main.py	2010-08-30 09:37:56 +0000
+++ src/u1sync/main.py	2010-08-30 09:37:56 +0000
@@ -357,4 +357,4 @@
 if __name__ == "__main__":
     # set the name of the process, this just works on windows
     sys.argv[0] = "Ubuntuone"
-    main(sys.argv[1:])
 \ No newline at end of file
+    sys.exit(main(sys.argv[1:]))
 \ No newline at end of file