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

[Manuel de la Peña]

Remove the not used used ui items.

[John Lenton (chipaca)]

review: Approve

=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-10-20 23:09:36 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml	2010-11-02 22:21:08 +0000
@@ -89,15 +89,7 @@
                                   Click="OnOpenSyncMenuItemClick"/>
                         <Separator />
                         <MenuItem Name="StateMenuItem" 
-                                  Header="State"/> <!-- Out sync, sync in progress (animate), everything up to date, error -->
-                        <MenuItem Name="CompleteInfoMenuItem" 
-                                  Header=""/>
-                        <MenuItem Name="SpaceLeftMenuItem" 
-                                  Header=""/>
-                        <Separator />
-                        <MenuItem x:Uid="RecentlyModifyFilesMenuItem" 
-                                  Name="RecentlyModifyFilesMenuItem" 
-                                  Header="{x:Static resx:Resources.NotificationIconRecentlyModifyFilesLabel}" />
+                                  Header="State"/> 
                         <Separator />
                         <MenuItem x:Uid="HelpMenuItem" 
                                   Name="HelpMenuItem" 
 
=== modified file 'src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs'
--- src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-10-20 23:09:36 +0000
+++ src/Canonical.UbuntuOne.Client.Views/NotifyIcon.xaml.cs	2010-11-02 22:21:08 +0000
@@ -62,8 +62,8 @@
         public bool IsManualSyncEnabled
         {
             get { return UbuntuOneManualSync.IsEnabled; }
-            set 
-            { 
+            set
+            {
                 UbuntuOneManualSync.IsEnabled = value;
                 if (!UbuntuOneManualSync.IsEnabled)
                 {
@@ -104,7 +104,11 @@
         public string State
         {
             get { return (string)StateMenuItem.Header; }
-            set { StateMenuItem.Header = value; }
+            set
+            {
+                StateMenuItem.Header = value;
+                Title = value;
+            }
         }
 
         /// <summary>
@@ -125,7 +129,7 @@
         {
             get
             {
-                if(_dispatcher == null)
+                if (_dispatcher == null)
                 {
                     lock (_dispatcherLock)
                     {
 
=== modified file 'src/UbuntuOneClient/Config/log4net.config'
--- src/UbuntuOneClient/Config/log4net.config	2010-10-20 14:28:58 +0000
+++ src/UbuntuOneClient/Config/log4net.config	2010-11-02 22:21:08 +0000
@@ -2,7 +2,7 @@
 <log4net>
   <appender name="RollingFileAppender"
             type="log4net.Appender.RollingFileAppender">
-    <file value="~/Logs/Client.log" />
+    <file value="Logs/Client.log" />
     <appendToFile value="true" />
     <rollingStyle value="Size" />
     <maxSizeRollBackups value="10" />