[pan2/testing: 273/279] a few cleanups

[Heinrich MÃller <henmull src gnome org>]

commit d25a18c3d364ab4076275834ff0490754549c126
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Sat Dec 3 12:54:03 2011 +0100

    a few cleanups

 pan/gui/gui.cc                |    1 +
 pan/tasks/socket-impl-gio.cc  |    3 +--
 pan/tasks/socket-impl-main.cc |    4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index bbcf55a..7153835 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -979,6 +979,7 @@ void GUI :: do_read_next_watched_article ()
 }
 void GUI :: do_read_next_unread_thread ()
 {
+  std::cerr << "FIXME " << LINE_ID << std::endl;
   _header_pane->read_next_unread_thread ();
 }
 void GUI :: do_read_next_thread ()
diff --git a/pan/tasks/socket-impl-gio.cc b/pan/tasks/socket-impl-gio.cc
index 73ff733..b2a2aa2 100644
--- a/pan/tasks/socket-impl-gio.cc
+++ b/pan/tasks/socket-impl-gio.cc
@@ -227,7 +227,7 @@ namespace
 #endif
     g_io_channel_set_encoding (channel, NULL, NULL);
     g_io_channel_set_buffered (channel, true);
-//    g_io_channel_set_line_term (channel, "\n", 1);
+    g_io_channel_set_line_term (channel, "\n", 1);
     return channel;
   }
 }
@@ -286,7 +286,6 @@ GIOChannelSocket :: open (const StringView& address, int port, std::string& setm
 {
   _host.assign (address.str, address.len);
   _channel = create_channel (address, port, setme_err);
-  debug("SocketSSL open "<<_channel);
   return _channel != 0;
 }
 
diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc
index 21aefbd..24ddff7 100644
--- a/pan/tasks/socket-impl-main.cc
+++ b/pan/tasks/socket-impl-main.cc
@@ -37,7 +37,9 @@
 #include <cerrno>
 #include <cstring>
 
-#include <pan/usenet-utils/ssl-utils.h>
+#ifdef HAVE_OPENSSL
+  #include <pan/usenet-utils/ssl-utils.h>
+#endif
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
 #include <pan/general/locking.h>