diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-11-27 10:45:02 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-11-27 10:45:02 -0500 |
| commit | 9875c3a7e986382213b3c97b5da9a6cc9acff677 (patch) | |
| tree | 05fc1cf10a318f6bfa5b53cd0c80c59e9067771b | |
| parent | a6403dab45fe60fb304233e310ceb5aea93dfbff (diff) | |
| parent | eb38911e59a46bd3549130e20a85c6060aece154 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Server.Mac.userprefs | 19 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mac/AppController.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj | 2 |
3 files changed, 15 insertions, 12 deletions
diff --git a/MediaBrowser.Server.Mac.userprefs b/MediaBrowser.Server.Mac.userprefs index 3a1ead51f..fd846d5e5 100644 --- a/MediaBrowser.Server.Mac.userprefs +++ b/MediaBrowser.Server.Mac.userprefs @@ -1,17 +1,23 @@ <Properties> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" /> - <MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mac/AppController.cs"> + <MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mac/Main.cs"> <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> <Pads> <Pad Id="ProjectPad"> <State expanded="True"> - <Node name="MediaBrowser.Server.Mac" expanded="True"> - <Node name="Resources" expanded="True"> - <Node name="appicon.icns" selected="True" /> - </Node> + <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" /> @@ -22,7 +28,6 @@ </MonoDevelop.Ide.Workbench> <MonoDevelop.Ide.DebuggingService.Breakpoints> <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" /> </BreakpointStore> </MonoDevelop.Ide.DebuggingService.Breakpoints> diff --git a/MediaBrowser.Server.Mac/AppController.cs b/MediaBrowser.Server.Mac/AppController.cs index 445a54b3d..296d3f23c 100644 --- a/MediaBrowser.Server.Mac/AppController.cs +++ b/MediaBrowser.Server.Mac/AppController.cs @@ -73,9 +73,9 @@ namespace MediaBrowser.Server.Mac }); statusMenu.AddItem (quitMenuItem); - //ConfigurationManager.ConfigurationUpdated -= Instance_ConfigurationUpdated; - //LocalizeText (); - //ConfigurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated; + ConfigurationManager.ConfigurationUpdated -= Instance_ConfigurationUpdated; + LocalizeText (); + ConfigurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated; } public IServerApplicationHost AppHost{ get; set;} diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj index 73e2e601a..ed46ec393 100644 --- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj +++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj @@ -37,7 +37,6 @@ <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
- <LinkMode>Full</LinkMode>
<UseSGen>false</UseSGen>
<IncludeMonoRuntime>true</IncludeMonoRuntime>
<EnablePackageSigning>false</EnablePackageSigning>
@@ -53,7 +52,6 @@ <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
- <LinkMode>Full</LinkMode>
<UseSGen>false</UseSGen>
<IncludeMonoRuntime>true</IncludeMonoRuntime>
<PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
|