From 3c473752298e2bc91d3cb10a13c236cfaa2bc11e Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Sun, 2 Sep 2012 13:34:12 -0400
Subject: Weather updates

---
 MediaBrowser.ApiInteraction/ApiClient.cs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.ApiInteraction/ApiClient.cs')

diff --git a/MediaBrowser.ApiInteraction/ApiClient.cs b/MediaBrowser.ApiInteraction/ApiClient.cs
index bc06aa9a2..3de40f6a8 100644
--- a/MediaBrowser.ApiInteraction/ApiClient.cs
+++ b/MediaBrowser.ApiInteraction/ApiClient.cs
@@ -573,9 +573,9 @@ namespace MediaBrowser.ApiInteraction
         {
             string url = ApiUrl + "/ServerConfiguration";
 
-            using (Stream stream = await GetSerializedStreamAsync(url).ConfigureAwait(false))
+            using (Stream stream = await GetSerializedStreamAsync(url, ApiInteraction.SerializationFormat.Json).ConfigureAwait(false))
             {
-                return DeserializeFromStream<ServerConfiguration>(stream);
+                return DeserializeFromStream<ServerConfiguration>(stream, ApiInteraction.SerializationFormat.Json);
             }
         }
 
@@ -622,19 +622,27 @@ namespace MediaBrowser.ApiInteraction
         /// This is a helper around getting a stream from the server that contains serialized data
         /// </summary>
         private Task<Stream> GetSerializedStreamAsync(string url)
+        {
+            return GetSerializedStreamAsync(url, SerializationFormat);
+        }
+
+        /// <summary>
+        /// This is a helper around getting a stream from the server that contains serialized data
+        /// </summary>
+        private Task<Stream> GetSerializedStreamAsync(string url, SerializationFormat serializationFormat)
         {
             if (url.IndexOf('?') == -1)
             {
-                url += "?dataformat=" + SerializationFormat.ToString().ToLower();
+                url += "?dataformat=" + serializationFormat.ToString().ToLower();
             }
             else
             {
-                url += "&dataformat=" + SerializationFormat.ToString().ToLower();
+                url += "&dataformat=" + serializationFormat.ToString().ToLower();
             }
 
             return GetStreamAsync(url);
         }
-
+        
         private T DeserializeFromStream<T>(Stream stream)
         {
             return DeserializeFromStream<T>(stream, SerializationFormat);
-- 
cgit v1.2.3