michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Luke Pulverenti 2014-11-27 10:45:02 -05:00
commit 9875c3a7e9
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
MediaBrowser.Server.Mac.userprefs
View File

@ -1,17 +1,23 @@
<Properties> <Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mac/AppController.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mac/Main.cs">
<Files> <Files>
<File FileName="MediaBrowser.Server.Mac/AppController.cs" Line="28" Column="28" /> <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" />
</Files> </Files>
<Pads> <Pads>
<Pad Id="ProjectPad"> <Pad Id="ProjectPad">
<State expanded="True"> <State expanded="True">
<Node name="MediaBrowser.Server.Mac" expanded="True"> <Node name="MediaBrowser.Common.Implementations" expanded="True">
<Node name="Resources" expanded="True"> <Node name="Logging" expanded="True" />
<Node name="appicon.icns" selected="True" />
</Node>
</Node> </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.Server.Startup.Common" expanded="True" />
<Node name="MediaBrowser.WebDashboard" expanded="True" /> <Node name="MediaBrowser.WebDashboard" expanded="True" />
<Node name="MediaBrowser.XbmcMetadata" expanded="True" /> <Node name="MediaBrowser.XbmcMetadata" expanded="True" />
@ -22,7 +28,6 @@
</MonoDevelop.Ide.Workbench> </MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints> <MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore> <BreakpointStore>
<Breakpoint file="/Users/luke/MediaBrowser/MediaBrowser.Server.Mac/Main.cs" line="58" column="1" />
<Breakpoint file="/Users/luke/MediaBrowser/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs" line="233" column="1" /> <Breakpoint file="/Users/luke/MediaBrowser/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs" line="233" column="1" />
</BreakpointStore> </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints> </MonoDevelop.Ide.DebuggingService.Breakpoints>

6
MediaBrowser.Server.Mac/AppController.cs
View File

@ -73,9 +73,9 @@ namespace MediaBrowser.Server.Mac
}); });
statusMenu.AddItem (quitMenuItem); statusMenu.AddItem (quitMenuItem);
//ConfigurationManager.ConfigurationUpdated -= Instance_ConfigurationUpdated; ConfigurationManager.ConfigurationUpdated -= Instance_ConfigurationUpdated;
//LocalizeText (); LocalizeText ();
//ConfigurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated; ConfigurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated;
} }
public IServerApplicationHost AppHost{ get; set;} public IServerApplicationHost AppHost{ get; set;}

2
MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
View File

@ -37,7 +37,6 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
<LinkMode>Full</LinkMode>
<UseSGen>false</UseSGen> <UseSGen>false</UseSGen>
<IncludeMonoRuntime>true</IncludeMonoRuntime> <IncludeMonoRuntime>true</IncludeMonoRuntime>
<EnablePackageSigning>false</EnablePackageSigning> <EnablePackageSigning>false</EnablePackageSigning>
@ -53,7 +52,6 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
<LinkMode>Full</LinkMode>
<UseSGen>false</UseSGen> <UseSGen>false</UseSGen>
<IncludeMonoRuntime>true</IncludeMonoRuntime> <IncludeMonoRuntime>true</IncludeMonoRuntime>
<PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey> <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>