github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-30 11:40:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

Browse source
This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions
Download patch file Download diff file Expand all files Collapse all files

7
GreenshotConfluencePlugin/Forms/ConfluenceTreePicker.xaml.cs
View file

@ -27,7 +27,6 @@ using System.Windows.Input;
using System.Windows.Threading;
using Confluence;
using GreenshotPlugin.Core;
namespace GreenshotConfluencePlugin {
/// <summary>
@ -35,12 +34,12 @@ namespace GreenshotConfluencePlugin {
/// </summary>
public partial class ConfluenceTreePicker : System.Windows.Controls.Page {
private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(ConfluenceTreePicker));
private ConfluenceConnector confluenceConnector;
private ConfluenceUpload confluenceUpload;
private readonly ConfluenceConnector confluenceConnector;
private readonly ConfluenceUpload confluenceUpload;
private bool isInitDone = false;
public ConfluenceTreePicker(ConfluenceUpload confluenceUpload) {
this.confluenceConnector = ConfluencePlugin.ConfluenceConnector;
confluenceConnector = ConfluencePlugin.ConfluenceConnector;
this.confluenceUpload = confluenceUpload;
InitializeComponent();
}