Revision 8a84d039

b/trunk/Pithos.Client.WPF/App.xaml.cs
32 32
            AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
33 33
            TaskScheduler.UnobservedTaskException += OnUnobservedException;
34 34

  
35
            //Fix incorrect proxy settings by switching to default proxy, if the proxy server settings is empty
36
            if (Settings.Default.UseManualProxy && String.IsNullOrWhiteSpace(Settings.Default.ProxyServer))
37
            {
38
                Settings.Default.UseManualProxy = false;
39
                Settings.Default.UseDefaultProxy = true;
40
            }
41

  
35 42
            InitializeComponent();            
36 43
        }
37 44

  
b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
118 118
                        </DataGrid>
119 119
                    </StackPanel>
120 120
                </TabItem>
121
                <TabItem Header="Other">
121
                <!--<TabItem Header="Other">
122 122
                    <Grid>
123 123
                        <Grid.Resources>
124 124
                            <Style x:Key="NameColumnStyle" TargetType="TextBlock">
......
147 147
                        <TextBox x:Name="ContentDisposition" Grid.Row="1" Grid.Column="1" Style="{StaticResource ResourceKey=ValueColumnStyle}"/>
148 148
                        <TextBox x:Name="Manifest" Grid.Row="2" Grid.Column="1" Style="{StaticResource ResourceKey=ValueColumnStyle}"/>
149 149
                    </Grid>
150
                </TabItem>
150
                </TabItem>-->
151 151
            </TabControl>
152 152
            <StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Right">
153 153
                <Button Name="SaveChanges" Content="OK" Margin="5,5,10,5" Style="{StaticResource ButtonStyle}" IsDefault="False" />
b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
181 181
        
182 182
        [global::System.Configuration.UserScopedSettingAttribute()]
183 183
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
184
        [global::System.Configuration.DefaultSettingValueAttribute("False")]
184
        [global::System.Configuration.DefaultSettingValueAttribute("True")]
185 185
        public bool UseDefaultProxy {
186 186
            get {
187 187
                return ((bool)(this["UseDefaultProxy"]));
......
193 193
        
194 194
        [global::System.Configuration.UserScopedSettingAttribute()]
195 195
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
196
        [global::System.Configuration.DefaultSettingValueAttribute("True")]
196
        [global::System.Configuration.DefaultSettingValueAttribute("False")]
197 197
        public bool UseManualProxy {
198 198
            get {
199 199
                return ((bool)(this["UseManualProxy"]));
b/trunk/Pithos.Client.WPF/Properties/Settings.settings
42 42
      <Value Profile="(Default)">False</Value>
43 43
    </Setting>
44 44
    <Setting Name="UseDefaultProxy" Type="System.Boolean" Scope="User">
45
      <Value Profile="(Default)">False</Value>
45
      <Value Profile="(Default)">True</Value>
46 46
    </Setting>
47 47
    <Setting Name="UseManualProxy" Type="System.Boolean" Scope="User">
48
      <Value Profile="(Default)">True</Value>
48
      <Value Profile="(Default)">False</Value>
49 49
    </Setting>
50 50
    <Setting Name="CloudfilesAuthenticationUrl" Type="System.String" Scope="Application">
51 51
      <Value Profile="(Default)">https://auth.api.rackspacecloud.com</Value>
b/trunk/Pithos.Client.WPF/app.config
67 67
        <value>False</value>
68 68
      </setting>
69 69
      <setting name="UseDefaultProxy" serializeAs="String">
70
        <value>False</value>
70
        <value>True</value>
71 71
      </setting>
72 72
      <setting name="UseManualProxy" serializeAs="String">
73
        <value>True</value>
73
        <value>False</value>
74 74
      </setting>
75 75
      <setting name="MustUpgrade" serializeAs="String">
76 76
        <value>True</value>
b/trunk/Pithos.Core/Agents/NetworkAgent.cs
628 628
            Contract.EndContractBlock();
629 629

  
630 630
            if (_firstPoll) return;
631

  
631
            //TODO: Do I need the "Modified" check if I'm not going to delete files that
632
            //were not found on the server on the first run?
633
            //TODO: Files that were not found on the server on the first run should be marked IN CONFLICT
632 634
            var deleteCandidates = from state in FileState.Queryable
633 635
                                   where state.Modified <= pollTime && state.FilePath.StartsWith(accountInfo.AccountPath)
634 636
                                   select state;

Also available in: Unified diff