Merge branch 'kay.one' of github.com:NzbDrone/NzbDrone into markus

Conflicts:
	NzbDrone.Core/Providers/ExternalNotification/Prowl.cs
	NzbDrone.Core/Providers/ProwlProvider.cs
pull/2/head
Mark McDowall 13 years ago
commit 80d7d38c7b

@ -118,7 +118,8 @@
</CodeStyleSettings> </CodeStyleSettings>
<Daemon.SolutionSettings> <Daemon.SolutionSettings>
<SkipFilesAndFolders> <SkipFilesAndFolders>
<Item>43BD3BBD-1531-4D8F-9C08-E1CD544AB2CD/d:Content</Item> <Item>43BD3BBD-1531-4D8F-9C08-E1CD544AB2CD/d:Content/d:2011.2.712</Item>
<Item>43BD3BBD-1531-4D8F-9C08-E1CD544AB2CD/d:Content/d:jQueryUI</Item>
</SkipFilesAndFolders> </SkipFilesAndFolders>
</Daemon.SolutionSettings> </Daemon.SolutionSettings>
<SharedSolutionTemplateManager> <SharedSolutionTemplateManager>

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using Growl.Connector; using Growl.Connector;
using NLog; using NLog;
@ -9,7 +8,7 @@ namespace NzbDrone.Core.Providers
{ {
public class GrowlProvider public class GrowlProvider
{ {
private readonly Logger Logger = LogManager.GetCurrentClassLogger(); private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
private readonly Application _growlApplication = new Application("NzbDrone"); private readonly Application _growlApplication = new Application("NzbDrone");
private GrowlConnector _growlConnector; private GrowlConnector _growlConnector;

@ -1,7 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text;
using NLog; using NLog;
using Prowlin; using Prowlin;
@ -9,12 +7,7 @@ namespace NzbDrone.Core.Providers
{ {
public class ProwlProvider public class ProwlProvider
{ {
private readonly Logger Logger = LogManager.GetLogger("ProwlProvider"); private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
public ProwlProvider()
{
}
public virtual bool Verify(string apiKey) public virtual bool Verify(string apiKey)
{ {

Binary file not shown.
Loading…
Cancel
Save