Merge pull request #1085 from MediaBrowser/master

merge

5 files changed, 21 insertions, 19 deletions

diff --git a/MediaBrowser.Server.Mac.sln b/MediaBrowser.Server.Mac.sln
index 3d7c5e882..3167aa65f 100644
--- a/MediaBrowser.Server.Mac.sln
+++ b/MediaBrowser.Server.Mac.sln
@@ -1,7 +1,7 @@
 

 Microsoft Visual Studio Solution File, Format Version 12.00

 # Visual Studio 2012

-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Server.Mac", "MediaBrowser.Server.Mac\MediaBrowser.Server.Mac.csproj", "{C97B98FA-00D4-4880-88B8-C76017A418AB}"

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.Server.Mac", "MediaBrowser.Server.Mac\Emby.Server.Mac.csproj", "{C97B98FA-00D4-4880-88B8-C76017A418AB}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Api", "MediaBrowser.Api\MediaBrowser.Api.csproj", "{4FD51AC5-2C16-4308-A993-C3A84F3B4582}"

 EndProject

diff --git a/MediaBrowser.Server.Mac.userprefs b/MediaBrowser.Server.Mac.userprefs
index fd846d5e5..b5f227685 100644
--- a/MediaBrowser.Server.Mac.userprefs
+++ b/MediaBrowser.Server.Mac.userprefs
@@ -1,26 +1,20 @@
 <Properties>
-  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mac/Main.cs">
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release" />
+  <MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Common/Properties/AssemblyInfo.cs">
     <Files>
-      <File FileName="MediaBrowser.Server.Mac/AppController.cs" Line="4" Column="4" />
-      <File FileName="MediaBrowser.Server.Mac/Main.cs" Line="18" Column="18" />
-      <File FileName="MediaBrowser.Server.Startup.Common/ApplicationHost.cs" Line="22" Column="22" />
-      <File FileName="MediaBrowser.Common.Implementations/BaseApplicationHost.cs" Line="14" Column="14" />
-      <File FileName="MediaBrowser.Common.Implementations/Logging/NlogManager.cs" Line="24" Column="24" />
+      <File FileName="MediaBrowser.Server.Mac/ImageMagickSharp.dll.config" Line="1" Column="1" />
+      <File FileName="MediaBrowser.Server.Startup.Common/ApplicationHost.cs" Line="1" Column="18" />
+      <File FileName="MediaBrowser.Api/ConnectService.cs" Line="7" Column="22" />
+      <File FileName="MediaBrowser.Server.Mac/AppController.cs" Line="22" Column="1" />
+      <File FileName="MediaBrowser.Server.Mac/AppDelegate.cs" Line="24" Column="1" />
+      <File FileName="MediaBrowser.Server.Mac/Main.cs" Line="60" Column="4" />
+      <File FileName="SharedVersion.cs" Line="1" Column="1" />
+      <File FileName="MediaBrowser.Common/Properties/AssemblyInfo.cs" Line="9" Column="12" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State expanded="True">
-          <Node name="MediaBrowser.Common.Implementations" expanded="True">
-            <Node name="Logging" expanded="True" />
-          </Node>
-          <Node name="MediaBrowser.Model" expanded="True">
-            <Node name="Logging" expanded="True" />
-          </Node>
-          <Node name="MediaBrowser.Server.Mac" expanded="True" selected="True" />
-          <Node name="MediaBrowser.Server.Startup.Common" expanded="True" />
-          <Node name="MediaBrowser.WebDashboard" expanded="True" />
-          <Node name="MediaBrowser.XbmcMetadata" expanded="True" />
+          <Node name="Emby.Server.Mac" selected="True" />
           <Node name="OpenSubtitlesHandler" expanded="True" />
         </State>
       </Pad>
@@ -32,4 +26,7 @@
     </BreakpointStore>
   </MonoDevelop.Ide.DebuggingService.Breakpoints>
   <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+  <StartupItems>
+    <String>MediaBrowser.Server.Mac/Emby.Server.Mac.csproj</String>
+  </StartupItems>
 </Properties>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 005d6fd56..8592fc460 100644
--- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -13,6 +13,7 @@
     <ReleaseVersion>

     </ReleaseVersion>

     <StartupObject>MediaBrowser.Server.Mac.MainClass</StartupObject>

+    <Description>A personal media server</Description>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <DebugSymbols>true</DebugSymbols>

diff --git a/MediaBrowser.Server.Mac/Info.plist b/MediaBrowser.Server.Mac/Info.plist
index ffb4b31ee..73c2036b1 100644
--- a/MediaBrowser.Server.Mac/Info.plist
+++ b/MediaBrowser.Server.Mac/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleIconFile</key>
 	<string>appicon</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.MediaBrowser.MediaBrowser.Server.Mac</string>
+	<string>com.emby.server</string>
 	<key>CFBundleName</key>
 	<string>Media Browser</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs
index 0a1fd1b3d..b4184f3b1 100644
--- a/MediaBrowser.Server.Mac/Main.cs
+++ b/MediaBrowser.Server.Mac/Main.cs
@@ -62,6 +62,10 @@ namespace MediaBrowser.Server.Mac
 			{
 				// TODO: Use CommonApplicationData? Will we always have write access?
 				programDataPath = Path.Combine(Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "mediabrowser-server");
+
+				if (!Directory.Exists (programDataPath)) {
+					programDataPath = Path.Combine(Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "emby-server");
+				}
 			}
 
 			// Within the mac bundle, go uo two levels then down into Resources folder