[smuxi: 160/179] Merge branch 'stable'

[Mirco M. M. Bauer <mmmbauer src gnome org>]

commit acff3ca1a849b58074a77d9d4339996328d63fa1
Merge: cc2e2c3 0f9cb3f
Author: Mirco Bauer <meebey meebey net>
Date:   Sun Jun 11 14:50:46 2017 +0800

    Merge branch 'stable'

 src/Frontend-GNOME/Views/ChatTreeView.cs |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)
---
diff --cc src/Frontend-GNOME/Views/ChatTreeView.cs
index 2427a69,2e87e37..1127478
--- a/src/Frontend-GNOME/Views/ChatTreeView.cs
+++ b/src/Frontend-GNOME/Views/ChatTreeView.cs
@@@ -25,9 -25,11 +25,12 @@@ namespace Smuxi.Frontend.Gnom
  {
      public class ChatTreeView : Gtk.TreeView
      {
+ #if LOG4NET
+         private static readonly log4net.ILog f_Logger = 
log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+ #endif
          public Gtk.TreeStore TreeStore { get; private set; }
          ThemeSettings ThemeSettings { get; set; }
 +        Gtk.TreeViewColumn ActivityColumn { get; set; }
          int f_CurrentChatNumber;
  
          public ChatView CurrentChatView {