Merge lp:~dangarner/xibo/379499 into lp:xibo/1.0

[Dan Garner]

=== modified file 'client/dotNET/Rss.cs'
--- client/dotNET/Rss.cs	2009-03-13 09:21:56 +0000
+++ client/dotNET/Rss.cs	2009-05-24 10:19:36 +0000
@@ -96,6 +96,9 @@
             try
             {
                 wc = new System.Net.WebClient();
+                wc.Encoding = System.Text.Encoding.UTF8;
+
+                System.Diagnostics.Debug.WriteLine("Created at WebClient and set the Encoding to UTF8", "RSS - Refresh local RSS");
 
                 wc.OpenReadCompleted += new System.Net.OpenReadCompletedEventHandler(wc_OpenReadCompleted);
                 
@@ -109,6 +112,8 @@
 
         void wc_OpenReadCompleted(object sender, System.Net.OpenReadCompletedEventArgs e)
         {
+            String rssContents;
+
             if (e.Error != null)
             {
                 System.Diagnostics.Trace.WriteLine(String.Format("[*]ScheduleID:{1},LayoutID:{2},MediaID:{3},Message:{0}", e.Error, scheduleId, layoutId, mediaid));
@@ -122,11 +127,14 @@
 
             try
             {
-                System.IO.StreamReader sr = new System.IO.StreamReader(data);
+                System.IO.StreamReader sr = new System.IO.StreamReader(data, true);
+                rssContents = sr.ReadToEnd();
 
                 StreamWriter sw = new StreamWriter(File.Open(rssFilePath, FileMode.Create, FileAccess.Write, FileShare.Read));
 
-                sw.Write(sr.ReadToEnd());
+                System.Diagnostics.Debug.WriteLine("Retrieved RSS - about to write it", "RSS - wc_OpenReadCompleted");
+                
+                sw.Write(rssContents);
 
                 sr.Close();
                 sw.Close();

=== modified file 'client/dotNET/VideoPlayer.resx'
--- client/dotNET/VideoPlayer.resx	2008-12-19 23:34:13 +0000
+++ client/dotNET/VideoPlayer.resx	2009-05-24 10:19:36 +0000
@@ -123,8 +123,8 @@
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAuQAAAAIB
         AAAAAQAAAAAAAAAAAAAAAKQAAAAAAwAACAACAAAAAAAFAAAAAAAAAPA/AwAAAAAABQAAAAAAAAAAAAgA
-        AgAAAAAAAwABAAAACwD//wMAAAAAAAsA//8IAAIAAAAAAAMAMgAAAAsAAAAIAAoAAABuAG8AbgBlAAAA
-        CwD//wsA//8LAAAACwAAAAsAAAAIAAIAAAAAAAgAAgAAAAAACAACAAAAAAAIAAIAAAAAAAsAAAATHgAA
+        AgAAAAAAAwABAAAACwD//wMAAAAAAAsAAAAIAAIAAAAAAAMAMgAAAAsAAAAIAAoAAABuAG8AbgBlAAAA
+        CwD//wsAAAALAAAACwAAAAsAAAAIAAIAAAAAAAgAAgAAAAAACAACAAAAAAAIAAIAAAAAAAsAAAATHgAA
         zRsAAAs=
 </value>
   </data>

=== modified file 'client/dotNET/bin/Release/XiboClient.XmlSerializers.dll'
Binary files client/dotNET/bin/Release/XiboClient.XmlSerializers.dll	2009-03-28 19:13:50 +0000 and client/dotNET/bin/Release/XiboClient.XmlSerializers.dll	2009-05-24 10:19:36 +0000 differ
=== modified file 'client/dotNET/bin/Release/XiboClient.exe'
Binary files client/dotNET/bin/Release/XiboClient.exe	2009-03-28 19:13:50 +0000 and client/dotNET/bin/Release/XiboClient.exe	2009-05-24 10:19:36 +0000 differ
=== modified file 'client/dotNET/bin/Release/XiboClient.pdb'
Binary files client/dotNET/bin/Release/XiboClient.pdb	2009-03-28 19:13:50 +0000 and client/dotNET/bin/Release/XiboClient.pdb	2009-05-24 10:19:36 +0000 differ