Merge branch 'Polling' of https://code.grnet.gr/git/pithos-ms-client into Polling

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index bfde0a9..735082d 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -6,12 +6,13 @@
         xmlns:Converters="clr-namespace:Pithos.Client.WPF.Converters" 
         x:Name="TheView"
         Title="Pithos+ Preferences" Height="436" Width="732" 
-        ShowInTaskbar="true"
         WindowStartupLocation="CenterScreen"
         Icon="/PithosPlus;component/Images/PithosTaskbar.png"
         WindowStyle="ToolWindow"        
         Topmost="True"
         ResizeMode="NoResize"
+        Topmost="True"
+        ShowInTaskbar="False"
         Background="White">
         
         <!-- Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}"> -->

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index 2bd73ed..8630a78 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -93,5 +93,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.20702.4")]
-[assembly: AssemblyFileVersionAttribute("0.7.20702.4")]
+[assembly: AssemblyVersion("0.7.20702.5")]
+[assembly: AssemblyFileVersionAttribute("0.7.20702.5")]