[pan2/testing: 259/279] * ssl and win32 compile fixes (still no SSL on win32 :( ) * added libnotify for fun (any implementat

From: Heinrich MÃller <henmull src gnome org>
To: commits-list gnome org
Cc:
Subject: [pan2/testing: 259/279] * ssl and win32 compile fixes (still no SSL on win32 :( ) * added libnotify for fun (any implementat
Date: Sat, 3 Dec 2011 22:43:11 +0000 (UTC)
commit 5a8d767e5763793496dc98ebb391e16db3ad6610
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Fri Nov 25 20:09:28 2011 +0100

    * ssl and win32 compile fixes (still no SSL on win32 :( )
    * added libnotify for fun (any implementation ideas? )

 configure.in                     |   13 +
 pan.cbp                          |  973 +++++++++++++++++++++++++++++---------
 pan/data/cert-store.cc           |    3 +
 pan/data/cert-store.h            |    4 +
 pan/general/debug.cc             |    2 +-
 pan/general/debug.h              |    4 +-
 pan/general/file-util.cc         |    6 +
 pan/gui/Makefile.am              |    4 +-
 pan/gui/actions.cc               |    1 -
 pan/gui/group-pane.cc            |    8 +-
 pan/gui/gui.cc                   |    8 +-
 pan/gui/pan.cc                   |   56 ++-
 pan/gui/pan.ui.h                 |    5 -
 pan/gui/prefs-ui.cc              |   11 +-
 pan/gui/score-add-ui.cc          |   30 +-
 pan/tasks/decoder.cc             |    2 +-
 pan/tasks/encoder.cc             |    1 +
 pan/tasks/socket-impl-main.cc    |   15 +-
 pan/tasks/socket-impl-main.h     |    3 +
 pan/tasks/socket-impl-openssl.cc |   24 +-
 pan/tasks/socket-impl-openssl.h  |    9 +-
 pan/usenet-utils/ssl-utils.h     |   10 +-
 22 files changed, 891 insertions(+), 301 deletions(-)
---
diff --git a/configure.in b/configure.in
index 1da7d5b..e1e2263 100644
--- a/configure.in
+++ b/configure.in
@@ -51,11 +51,13 @@ GTK_REQUIRED=2.16.0
 GTK3_REQUIRED=3.0.0
 GTKSPELL_REQUIRED=2.0.7
 OPENSSL_REQUIRED=1.0.0
+LIBNOTIFY_REQUIRED=0.4.1
 AC_SUBST(GLIB_REQUIRED)
 AC_SUBST(GMIME_REQUIRED)
 AC_SUBST(GTK_REQUIRED)
 AC_SUBST(GTKSPELL_REQUIRED)
 AC_SUBST(OPENSSL_REQUIRED)
+AC_SUBST(LIBNOTIFY_REQUIRED)
 
 AC_PROG_CXX
 AC_HEADER_STDC
@@ -113,6 +115,17 @@ if test "x$want_openssl" = "xyes" ; then
 	                  AC_MSG_RESULT(no)])
 fi
 
+AC_ARG_ENABLE([libnotify],
+AC_HELP_STRING([--enable-libnotify],[enable libnotify support]),,[enable_libnotify=yes])
+if test "x$enable_libnotify" = "xyes" ; then
+  PKG_CHECK_MODULES([LIBNOTIFY],[libnotify >= $LIBNOTIFY_REQUIRED],[HAVE_LIBNOTIFY="yes"],[HAVE_LIBNOTIFY="no"])
+  AC_SUBST([LIBNOTIFY_CFLAGS])
+  AC_SUBST([LIBNOTIFY_LIBS])
+  if test "x$HAVE_LIBNOTIFY" = "xyes"; then
+    AC_DEFINE([HAVE_LIBNOTIFY],[1],[libnotify is available on this machine])
+  fi
+fi
+
 dnl Check to see if strftime supports the use of %l and %k
 AC_MSG_CHECKING(for %l and %k support in strftime)
 AC_TRY_RUN([
diff --git a/pan.cbp b/pan.cbp
index 40f4e66..3ed50e5 100644
--- a/pan.cbp
+++ b/pan.cbp
@@ -15,10 +15,11 @@
 			<SilentBuild command="$make -j8 -s -f $makefile $target" />
 		</MakeCommands>
 		<Build>
-			<Target title="all">
+			<Target title="all_linux">
+				<Option platforms="Unix;" />
 				<Option output="pan/gui/pan" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
-				<Option type="1" />
+				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-O2" />
@@ -27,298 +28,798 @@
 					<Add option="-s" />
 				</Linker>
 				<MakeCommands>
-					<Build command="$make -j8 -f $makefile $target" />
+					<Build command="$make -j8 -f $makefile " />
 					<CompileFile command="$make -j8 -f $makefile $file" />
-					<Clean command="$make -j8 f $makefile clean$target" />
+					<Clean command="$make -j8 f $makefile clean" />
 					<DistClean command="$make -f $makefile distclean$target" />
-					<AskRebuildNeeded command="$make -j8 -q -f $makefile $target" />
-					<SilentBuild command="$make -j8 -s -f $makefile $target" />
+					<AskRebuildNeeded command="$make -j8 -q -f $makefile " />
+					<SilentBuild command="$make -j8 -s -f $makefile" />
+				</MakeCommands>
+			</Target>
+			<Target title="all_win32">
+				<Option platforms="Windows;" />
+				<Option output="pan/gui/pan" prefix_auto="1" extension_auto="1" />
+				<Option type="0" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+				<MakeCommands>
+					<Build command="$make -j8 -f $makefile " />
+					<CompileFile command="$make -j8 -f $makefile $file" />
+					<Clean command="$make -j8 f $makefile clean" />
+					<DistClean command="$make -f $makefile distclean$target" />
+					<AskRebuildNeeded command="$make -j8 -q -f $makefile " />
+					<SilentBuild command="$make -j8 -s -f $makefile" />
 				</MakeCommands>
 			</Target>
 		</Build>
+		<VirtualTargets>
+			<Add alias="all" targets="all_linux;all_win32;" />
+		</VirtualTargets>
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
-		<Unit filename="config.h" />
-		<Unit filename="pan/data-impl/add-server.cc" />
-		<Unit filename="pan/data-impl/article-filter.cc" />
-		<Unit filename="pan/data-impl/article-filter.h" />
-		<Unit filename="pan/data-impl/cert-store.cc" />
-		<Unit filename="pan/data-impl/cert-store.h" />
-		<Unit filename="pan/data-impl/data-impl.cc" />
-		<Unit filename="pan/data-impl/data-impl.h" />
-		<Unit filename="pan/data-impl/data-io.cc" />
-		<Unit filename="pan/data-impl/data-io.h" />
-		<Unit filename="pan/data-impl/defgroup.h" />
-		<Unit filename="pan/data-impl/groups.cc" />
-		<Unit filename="pan/data-impl/headers-test.cc" />
-		<Unit filename="pan/data-impl/headers.cc" />
-		<Unit filename="pan/data-impl/memchunk.h" />
-		<Unit filename="pan/data-impl/my-tree.cc" />
-		<Unit filename="pan/data-impl/profiles.cc" />
-		<Unit filename="pan/data-impl/profiles.h" />
-		<Unit filename="pan/data-impl/rules-filter.cc" />
-		<Unit filename="pan/data-impl/rules-filter.h" />
-		<Unit filename="pan/data-impl/server.cc" />
-		<Unit filename="pan/data-impl/speed-test-load-group.cc" />
-		<Unit filename="pan/data-impl/sql-db.cc" />
-		<Unit filename="pan/data-impl/sql-db.h" />
-		<Unit filename="pan/data-impl/task-archive.cc" />
-		<Unit filename="pan/data-impl/xover.cc" />
-		<Unit filename="pan/data/article-cache.cc" />
-		<Unit filename="pan/data/article-cache.h" />
-		<Unit filename="pan/data/article-test.cc" />
-		<Unit filename="pan/data/article.cc" />
-		<Unit filename="pan/data/article.h" />
-		<Unit filename="pan/data/cert-store.cc" />
-		<Unit filename="pan/data/cert-store.h" />
-		<Unit filename="pan/data/data.cc" />
-		<Unit filename="pan/data/data.h" />
-		<Unit filename="pan/data/defgroup.h" />
-		<Unit filename="pan/data/encode-cache.cc" />
-		<Unit filename="pan/data/encode-cache.h" />
-		<Unit filename="pan/data/parts.cc" />
-		<Unit filename="pan/data/parts.h" />
-		<Unit filename="pan/data/server-info.h" />
-		<Unit filename="pan/data/xover-cache.h" />
-		<Unit filename="pan/data/xref-test.cc" />
-		<Unit filename="pan/data/xref.cc" />
-		<Unit filename="pan/data/xref.h" />
-		<Unit filename="pan/general/debug.cc" />
-		<Unit filename="pan/general/debug.h" />
-		<Unit filename="pan/general/defgroup.h" />
-		<Unit filename="pan/general/e-util.cc" />
-		<Unit filename="pan/general/e-util.h" />
-		<Unit filename="pan/general/file-util.cc" />
-		<Unit filename="pan/general/file-util.h" />
-		<Unit filename="pan/general/gdk-threads.h" />
-		<Unit filename="pan/general/line-reader.cc" />
-		<Unit filename="pan/general/line-reader.h" />
-		<Unit filename="pan/general/locking.h" />
-		<Unit filename="pan/general/log.cc" />
-		<Unit filename="pan/general/log.h" />
-		<Unit filename="pan/general/macros.h" />
-		<Unit filename="pan/general/map-vector.h" />
-		<Unit filename="pan/general/messages.h" />
-		<Unit filename="pan/general/non-gui.h" />
-		<Unit filename="pan/general/progress-test.cc" />
-		<Unit filename="pan/general/progress.cc" />
-		<Unit filename="pan/general/progress.h" />
-		<Unit filename="pan/general/quark-test.cc" />
-		<Unit filename="pan/general/quark.cc" />
-		<Unit filename="pan/general/quark.h" />
-		<Unit filename="pan/general/sorted-vector.h" />
-		<Unit filename="pan/general/string-view-test.cc" />
-		<Unit filename="pan/general/string-view.cc" />
-		<Unit filename="pan/general/string-view.h" />
-		<Unit filename="pan/general/test.h" />
-		<Unit filename="pan/general/text-match-test.cc" />
-		<Unit filename="pan/general/text-match.cc" />
-		<Unit filename="pan/general/text-match.h" />
-		<Unit filename="pan/general/time-elapsed.h" />
-		<Unit filename="pan/general/utf8-utils.cc" />
-		<Unit filename="pan/general/utf8-utils.h" />
-		<Unit filename="pan/general/worker-pool.cc" />
-		<Unit filename="pan/general/worker-pool.h" />
-		<Unit filename="pan/gui/action-manager.h" />
-		<Unit filename="pan/gui/actions.cc" />
-		<Unit filename="pan/gui/actions.h" />
-		<Unit filename="pan/gui/body-pane.cc" />
-		<Unit filename="pan/gui/body-pane.h" />
-		<Unit filename="pan/gui/defgroup.h" />
-		<Unit filename="pan/gui/dl-headers-ui.cc" />
-		<Unit filename="pan/gui/dl-headers-ui.h" />
+		<Unit filename="config.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/add-server.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/article-filter.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/article-filter.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/cert-store.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/cert-store.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/data-impl.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/data-impl.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/data-io.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/data-io.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/defgroup.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/groups.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/headers-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/headers.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/memchunk.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/my-tree.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/profiles.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/profiles.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/rules-filter.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/rules-filter.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/server.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/speed-test-load-group.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/sql-db.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/sql-db.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/task-archive.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data-impl/xover.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/article-cache.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/article-cache.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/article-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/article.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/article.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/cert-store.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/cert-store.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/data.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/data.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/defgroup.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/encode-cache.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/encode-cache.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/parts.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/parts.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/server-info.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/xover-cache.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/xref-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/xref.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/data/xref.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/debug.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/debug.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/defgroup.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/e-util.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/e-util.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/file-util.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/file-util.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/gdk-threads.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/line-reader.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/line-reader.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/locking.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/log.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/log.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/macros.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/map-vector.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/messages.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/non-gui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/progress-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/progress.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/progress.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/quark-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/quark.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/quark.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/sorted-vector.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/string-view-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/string-view.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/string-view.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/test.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/text-match-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/text-match.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/text-match.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/time-elapsed.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/utf8-utils.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/utf8-utils.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/worker-pool.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/general/worker-pool.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/action-manager.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/actions.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/actions.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/body-pane.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/body-pane.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/defgroup.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/dl-headers-ui.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/dl-headers-ui.h">
+			<Option target="all_linux" />
+		</Unit>
 		<Unit filename="pan/gui/e-action-combo-box.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/e-action-combo-box.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="pan/gui/e-action-combo-box.h" />
 		<Unit filename="pan/gui/e-charset-combo-box.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/e-charset-combo-box.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="pan/gui/e-charset-combo-box.h" />
 		<Unit filename="pan/gui/e-charset-dialog.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/e-charset-dialog.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="pan/gui/e-charset-dialog.h" />
 		<Unit filename="pan/gui/e-charset.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/e-charset.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/group-pane.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/group-pane.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/group-prefs-dialog.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/group-prefs-dialog.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/group-prefs.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/group-prefs.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/gtk_compat.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/gui.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/gui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/header-pane-factory.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/header-pane-factory.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/header-pane.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/header-pane.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/hig.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/hig.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/license.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/log-ui.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/log-ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/pad.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/pan-file-entry.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/pan-file-entry.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="pan/gui/e-charset.h" />
-		<Unit filename="pan/gui/group-pane.cc" />
-		<Unit filename="pan/gui/group-pane.h" />
-		<Unit filename="pan/gui/group-prefs-dialog.cc" />
-		<Unit filename="pan/gui/group-prefs-dialog.h" />
-		<Unit filename="pan/gui/group-prefs.cc" />
-		<Unit filename="pan/gui/group-prefs.h" />
-		<Unit filename="pan/gui/gtk_compat.h" />
-		<Unit filename="pan/gui/gui.cc" />
-		<Unit filename="pan/gui/gui.h" />
-		<Unit filename="pan/gui/header-pane-factory.cc" />
-		<Unit filename="pan/gui/header-pane-factory.h" />
-		<Unit filename="pan/gui/header-pane.cc" />
-		<Unit filename="pan/gui/header-pane.h" />
-		<Unit filename="pan/gui/hig.cc" />
-		<Unit filename="pan/gui/hig.h" />
-		<Unit filename="pan/gui/license.h" />
-		<Unit filename="pan/gui/log-ui.cc" />
-		<Unit filename="pan/gui/log-ui.h" />
-		<Unit filename="pan/gui/pad.h" />
-		<Unit filename="pan/gui/pan-file-entry.cc" />
-		<Unit filename="pan/gui/pan-file-entry.h" />
 		<Unit filename="pan/gui/pan-pixbufs.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/pan-tree.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/pan-tree.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/pan-ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/pan.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/pan.ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/panrc.rc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/post-ui.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/post-ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/post.ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/prefs-file.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/prefs-file.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/prefs-ui.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/prefs-ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/prefs.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/prefs.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/profiles-dialog.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/profiles-dialog.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/progress-view.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/progress-view.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/render-bytes.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/render-bytes.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/save-ui.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/save-ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/score-add-ui.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/score-add-ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/score-view-ui.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/score-view-ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/server-ui.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/server-ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/tango-colors.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/task-pane.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/task-pane.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/taskpane.ui.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/url.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/url.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/wait.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="pan/gui/pan-tree.cc" />
-		<Unit filename="pan/gui/pan-tree.h" />
-		<Unit filename="pan/gui/pan-ui.h" />
-		<Unit filename="pan/gui/pan.cc" />
-		<Unit filename="pan/gui/pan.ui.h" />
-		<Unit filename="pan/gui/panrc.rc" />
-		<Unit filename="pan/gui/post-ui.cc" />
-		<Unit filename="pan/gui/post-ui.h" />
-		<Unit filename="pan/gui/post.ui.h" />
-		<Unit filename="pan/gui/prefs-file.cc" />
-		<Unit filename="pan/gui/prefs-file.h" />
-		<Unit filename="pan/gui/prefs-ui.cc" />
-		<Unit filename="pan/gui/prefs-ui.h" />
-		<Unit filename="pan/gui/prefs.cc" />
-		<Unit filename="pan/gui/prefs.h" />
-		<Unit filename="pan/gui/profiles-dialog.cc" />
-		<Unit filename="pan/gui/profiles-dialog.h" />
-		<Unit filename="pan/gui/progress-view.cc" />
-		<Unit filename="pan/gui/progress-view.h" />
-		<Unit filename="pan/gui/render-bytes.cc" />
-		<Unit filename="pan/gui/render-bytes.h" />
-		<Unit filename="pan/gui/save-ui.cc" />
-		<Unit filename="pan/gui/save-ui.h" />
-		<Unit filename="pan/gui/score-add-ui.cc" />
-		<Unit filename="pan/gui/score-add-ui.h" />
-		<Unit filename="pan/gui/score-view-ui.cc" />
-		<Unit filename="pan/gui/score-view-ui.h" />
-		<Unit filename="pan/gui/server-ui.cc" />
-		<Unit filename="pan/gui/server-ui.h" />
-		<Unit filename="pan/gui/tango-colors.h" />
-		<Unit filename="pan/gui/task-pane.cc" />
-		<Unit filename="pan/gui/task-pane.h" />
-		<Unit filename="pan/gui/taskpane.ui.h" />
-		<Unit filename="pan/gui/url.cc" />
-		<Unit filename="pan/gui/url.h" />
-		<Unit filename="pan/gui/wait.h" />
 		<Unit filename="pan/gui/xface.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/gui/xface.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/icons/pan-pixbufs-internal.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/icons/pan-pixbufs.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/adaptable-set-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/adaptable-set.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/adaptable-set.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/decoder.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/decoder.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/defgroup.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/encoder.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/encoder.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/health.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/nntp-pool.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/nntp-pool.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/nntp.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/nntp.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/nzb-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/nzb.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/nzb.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/queue.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/queue.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/socket-impl-gio.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/socket-impl-gio.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/socket-impl-main.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/socket-impl-main.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/socket-impl-openssl.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/socket-impl-openssl.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/socket-impl-scripted.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/socket-impl-scripted.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/socket.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/socket.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-article.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-article.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-groups.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-groups.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-multipost.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-post.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-post.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-upload.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-upload.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-weak-ordering.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-xover.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task-xover.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/task.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/upload-queue.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/tasks/upload-queue.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/MersenneTwister.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/defgroup.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/filter-info.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/filter-info.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/gnksa-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/gnksa.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/gnksa.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/message-check-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/message-check.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/message-check.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/mime-utils.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/mime-utils.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/numbers-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/numbers.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/numbers.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/rules-info.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/rules-info.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/scorefile-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/scorefile.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/scorefile.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/ssl-utils.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/text-massager-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/text-massager.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/text-massager.h">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/url-find-test.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/url-find.cc">
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="pan/usenet-utils/url-find.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="pan/gui/xface.h" />
-		<Unit filename="pan/icons/pan-pixbufs-internal.h" />
-		<Unit filename="pan/icons/pan-pixbufs.h" />
-		<Unit filename="pan/tasks/adaptable-set-test.cc" />
-		<Unit filename="pan/tasks/adaptable-set.cc" />
-		<Unit filename="pan/tasks/adaptable-set.h" />
-		<Unit filename="pan/tasks/decoder.cc" />
-		<Unit filename="pan/tasks/decoder.h" />
-		<Unit filename="pan/tasks/defgroup.h" />
-		<Unit filename="pan/tasks/encoder.cc" />
-		<Unit filename="pan/tasks/encoder.h" />
-		<Unit filename="pan/tasks/health.h" />
-		<Unit filename="pan/tasks/nntp-pool.cc" />
-		<Unit filename="pan/tasks/nntp-pool.h" />
-		<Unit filename="pan/tasks/nntp.cc" />
-		<Unit filename="pan/tasks/nntp.h" />
-		<Unit filename="pan/tasks/nzb-test.cc" />
-		<Unit filename="pan/tasks/nzb.cc" />
-		<Unit filename="pan/tasks/nzb.h" />
-		<Unit filename="pan/tasks/queue.cc" />
-		<Unit filename="pan/tasks/queue.h" />
-		<Unit filename="pan/tasks/socket-impl-gio.cc" />
-		<Unit filename="pan/tasks/socket-impl-gio.h" />
-		<Unit filename="pan/tasks/socket-impl-main.cc" />
-		<Unit filename="pan/tasks/socket-impl-main.h" />
-		<Unit filename="pan/tasks/socket-impl-openssl.cc" />
-		<Unit filename="pan/tasks/socket-impl-openssl.h" />
-		<Unit filename="pan/tasks/socket-impl-scripted.cc" />
-		<Unit filename="pan/tasks/socket-impl-scripted.h" />
-		<Unit filename="pan/tasks/socket.cc" />
-		<Unit filename="pan/tasks/socket.h" />
-		<Unit filename="pan/tasks/task-article.cc" />
-		<Unit filename="pan/tasks/task-article.h" />
-		<Unit filename="pan/tasks/task-groups.cc" />
-		<Unit filename="pan/tasks/task-groups.h" />
-		<Unit filename="pan/tasks/task-multipost.h" />
-		<Unit filename="pan/tasks/task-post.cc" />
-		<Unit filename="pan/tasks/task-post.h" />
-		<Unit filename="pan/tasks/task-upload.cc" />
-		<Unit filename="pan/tasks/task-upload.h" />
-		<Unit filename="pan/tasks/task-weak-ordering.h" />
-		<Unit filename="pan/tasks/task-xover.cc" />
-		<Unit filename="pan/tasks/task-xover.h" />
-		<Unit filename="pan/tasks/task.cc" />
-		<Unit filename="pan/tasks/task.h" />
-		<Unit filename="pan/tasks/upload-queue.cc" />
-		<Unit filename="pan/tasks/upload-queue.h" />
-		<Unit filename="pan/usenet-utils/MersenneTwister.h" />
-		<Unit filename="pan/usenet-utils/defgroup.h" />
-		<Unit filename="pan/usenet-utils/filter-info.cc" />
-		<Unit filename="pan/usenet-utils/filter-info.h" />
-		<Unit filename="pan/usenet-utils/gnksa-test.cc" />
-		<Unit filename="pan/usenet-utils/gnksa.cc" />
-		<Unit filename="pan/usenet-utils/gnksa.h" />
-		<Unit filename="pan/usenet-utils/message-check-test.cc" />
-		<Unit filename="pan/usenet-utils/message-check.cc" />
-		<Unit filename="pan/usenet-utils/message-check.h" />
-		<Unit filename="pan/usenet-utils/mime-utils.cc" />
-		<Unit filename="pan/usenet-utils/mime-utils.h" />
-		<Unit filename="pan/usenet-utils/numbers-test.cc" />
-		<Unit filename="pan/usenet-utils/numbers.cc" />
-		<Unit filename="pan/usenet-utils/numbers.h" />
-		<Unit filename="pan/usenet-utils/rules-info.cc" />
-		<Unit filename="pan/usenet-utils/rules-info.h" />
-		<Unit filename="pan/usenet-utils/scorefile-test.cc" />
-		<Unit filename="pan/usenet-utils/scorefile.cc" />
-		<Unit filename="pan/usenet-utils/scorefile.h" />
-		<Unit filename="pan/usenet-utils/ssl-utils.h" />
-		<Unit filename="pan/usenet-utils/text-massager-test.cc" />
-		<Unit filename="pan/usenet-utils/text-massager.cc" />
-		<Unit filename="pan/usenet-utils/text-massager.h" />
-		<Unit filename="pan/usenet-utils/url-find-test.cc" />
-		<Unit filename="pan/usenet-utils/url-find.cc" />
-		<Unit filename="pan/usenet-utils/url-find.h" />
 		<Unit filename="uulib/crc32.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="uulib/crc32.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="uulib/crc32.h" />
 		<Unit filename="uulib/fptools.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="uulib/fptools.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="uulib/fptools.h" />
 		<Unit filename="uulib/uucheck.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="uulib/uudeview.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="uulib/uudeview.h" />
 		<Unit filename="uulib/uuencode.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
 		</Unit>
 		<Unit filename="uulib/uuencode2.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="uulib/uuint.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="uulib/uuint.h" />
 		<Unit filename="uulib/uulib.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
 		</Unit>
 		<Unit filename="uulib/uunconc.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
 		</Unit>
 		<Unit filename="uulib/uuscan.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
 		</Unit>
 		<Unit filename="uulib/uustring.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
+		</Unit>
+		<Unit filename="uulib/uustring.h">
+			<Option target="all_linux" />
 		</Unit>
-		<Unit filename="uulib/uustring.h" />
 		<Unit filename="uulib/uuutil.c">
 			<Option compilerVar="CC" />
+			<Option target="all_linux" />
 		</Unit>
 		<Extensions>
 			<envvars />
-			<code_completion />
+			<code_completion>
+				<search_path add="/home/imhotep/mingw-cross-env-current/usr/i686-pc-mingw32/bin" />
+				<search_path add="/home/imhotep/mingw-cross-env-current/usr/bin" />
+			</code_completion>
 			<lib_finder disable_auto="1" />
 			<debugger />
 		</Extensions>
diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc
index 56b5920..390a7ab 100644
--- a/pan/data/cert-store.cc
+++ b/pan/data/cert-store.cc
@@ -3,6 +3,9 @@
  * Pan - A Newsreader for Gtk+
  * Copyright (C) 2002-2006  Charles Kerr <charles rebelbase com>
  *
+ * This file
+ * Copyright (C) 2011 Heinrich Mü<sphemuel stud informatik uni-erlangen de>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
diff --git a/pan/data/cert-store.h b/pan/data/cert-store.h
index eb0487f..0058ce4 100644
--- a/pan/data/cert-store.h
+++ b/pan/data/cert-store.h
@@ -3,6 +3,9 @@
  * Pan - A Newsreader for Gtk+
  * Copyright (C) 2002-2006  Charles Kerr <charles rebelbase com>
  *
+ * This file
+ * Copyright (C) 2011 Heinrich Mü<sphemuel stud informatik uni-erlangen de>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
@@ -176,6 +179,7 @@ namespace pan
 
     void add_listener (void * l) {}
     void remove_listener (void * l) {}
+    bool in_blacklist (const Quark& s) { return false; }
 
     struct Listener
     {
diff --git a/pan/general/debug.cc b/pan/general/debug.cc
index d48ad4e..aae282f 100644
--- a/pan/general/debug.cc
+++ b/pan/general/debug.cc
@@ -6,5 +6,5 @@ namespace pan
   bool _debug_flag = false;
   bool _debug_verbose_flag = false;
   bool _verbose_flag = false;
-
+  std::ofstream dbg_file;
 }
diff --git a/pan/general/debug.h b/pan/general/debug.h
index 2655f41..de69f72 100644
--- a/pan/general/debug.h
+++ b/pan/general/debug.h
@@ -21,12 +21,14 @@
 #define __Debug_h__
 
 #include <iostream>
+#include <fstream>
 
 namespace pan
 {
   extern bool _debug_flag;
   extern bool _debug_verbose_flag;
   extern bool _verbose_flag;
+  extern std::ofstream dbg_file;
 
 }
 
@@ -35,7 +37,7 @@ namespace pan
 #define debug(A) \
   do { \
     if (_debug_flag) \
-      std::cerr << LINE_ID << ' ' << A << '\n'; \
+      std::cerr<< LINE_ID << ' ' << A << '\n'; \
   } while (0)
 
 #define debug_v(A) \
diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc
index f4ec2bc..8c724d1 100644
--- a/pan/general/file-util.cc
+++ b/pan/general/file-util.cc
@@ -30,7 +30,9 @@ extern "C"
   #include <sys/types.h>
   #include <glib.h>
   #include <glib/gi18n.h>
+# ifndef G_OS_WIN32
   #include <pwd.h>
+#endif
 }
 
 #include "debug.h"
@@ -111,6 +113,7 @@ namespace
 
   EX_ERRORS check_executable_bit(const char* d)
   {
+#ifndef G_OS_WIN32
     struct stat sb;
     if (stat (d, &sb) == -1) return EX_NOFILE;
     const char* user(g_get_user_name());
@@ -118,6 +121,9 @@ namespace
     if (sb.st_mode & S_IXUSR || ((sb.st_mode & S_IXGRP ) && pw->pw_gid == sb.st_gid))
       return EX_SUCCESS;
     return EX_BIT;
+#else
+    return EX_SUCCESS;
+#endif
   }
 }
 
diff --git a/pan/gui/Makefile.am b/pan/gui/Makefile.am
index 8f77364..3db1bed 100644
--- a/pan/gui/Makefile.am
+++ b/pan/gui/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I top_srcdir@ @GTKSPELL_CFLAGS@ @GTK_CFLAGS@ @GMIME_CFLAGS@ @GLIB_CFLAGS@ @OPENSSL_CFLAGS@ -DPANLOCALEDIR=\""$(panlocaledir)"\"
+AM_CPPFLAGS = -I top_srcdir@ @GTKSPELL_CFLAGS@ @GTK_CFLAGS@ @GMIME_CFLAGS@ @GLIB_CFLAGS@ @OPENSSL_CFLAGS@ @LIBNOTIFY_CFLAGS@ -DPANLOCALEDIR=\""$(panlocaledir)"\"
 
 noinst_LIBRARIES = libpangui.a
 
@@ -94,7 +94,7 @@ endif
 
 pan_SOURCES = gui.cc pan.cc $(WINRC)
 pan_LDADD = ./libpangui.a $(WINRCOBJ) ../data-impl/libpandata.a ../tasks/libtasks.a ../data/libdata.a ../usenet-utils/libusenetutils.a ../general/libgeneralutils.a \
-            ../../uulib/libuu.a @GTKSPELL_LIBS@ @GTK_LIBS@ @GMIME_LIBS@ @GLIB_LIBS@ @OPENSSL_LIBS@
+            ../../uulib/libuu.a @GTKSPELL_LIBS@ @GTK_LIBS@ @GMIME_LIBS@ @GLIB_LIBS@ @OPENSSL_LIBS@ @LIBNOTIFY_LIBS@
 
 if HAVE_WIN32
 pan_LDFLAGS = -mwindows
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index 5b39311..9e4259a 100644
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@ -82,7 +82,6 @@ namespace
       GtkIconSet * icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
       gtk_icon_factory_add (factory, my_builtin_icons[i].name, icon_set);
       g_object_unref (pixbuf);
-      g_object_unref (pixbuf);
       gtk_icon_set_unref (icon_set);
     }
 
diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc
index f3ab501..777ba43 100644
--- a/pan/gui/group-pane.cc
+++ b/pan/gui/group-pane.cc
@@ -503,8 +503,8 @@ namespace
 
   enum
   {
-    GROUP,
-    GROUP_REGEX
+    _GROUP,
+    _GROUP_REGEX
   };
 }
 
@@ -521,9 +521,9 @@ GroupPane :: set_filter (const std::string& search_text, int mode)
   TextMatch match;
   TextMatch * pmatch (0);
   if (!search_text.empty()) {
-    if (mode == GROUP)
+    if (mode == _GROUP)
       match.set (search_text, TextMatch::CONTAINS, false);
-    else if (mode == GROUP_REGEX)
+    else if (mode == _GROUP_REGEX)
       match.set (search_text, TextMatch::REGEX, false);
     pmatch = &match;
   }
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 628ee9a..18f7fc7 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -2104,12 +2104,12 @@ GUI :: on_verify_cert_failed(X509* cert, std::string server, std::string cert_na
 
   if (GUI::confirm_accept_new_cert_dialog(get_window(_root),cert,server))
     if (!_certstore.add(cert, server))
-      Log::add_urgent_va("Error adding certificate of server '%s' to Certificate Store",server.c_str());
-    else
-    {
+//      Log::add_urgent_va("Error adding certificate of server '%s' to Certificate Store",server.c_str());
+//    else
+//    {
       _data.set_server_cert(server, cert_name);
       _data.save_server_info(server);
-    }
+//    }
 }
 
 void
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index dccf5ef..0be4b3d 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -21,11 +21,14 @@
 #include <config.h>
 #include <signal.h>
 
+#ifdef HAVE_LIBNOTIFY
+  #include <libnotify/notify.h>
+#endif
+
 extern "C" {
   #include <glib/gi18n.h>
   #include <gtk/gtk.h>
   #include <gmime/gmime.h>
-  #include <X11/Xlib.h>
 }
 
 #ifdef G_OS_WIN32
@@ -157,13 +160,13 @@ namespace
       ICON_STATUS_ERROR,
       ICON_STATUS_IDLE,
       ICON_STATUS_NEW_ARTICLES,
-      ICON_NUM_STATUS_ICONS
+      NUM_STATUS_ICONS
     };
 
     struct Icon {
     const guint8 * pixbuf_txt;
     GdkPixbuf * pixbuf;
-    } status_icons[ICON_NUM_STATUS_ICONS] = {
+    } status_icons[NUM_STATUS_ICONS] = {
       { icon_status_online,          0 },
       { icon_status_offline,         0 },
       { icon_status_active,          0 },
@@ -235,6 +238,39 @@ namespace
         gtk_status_icon_set_from_pixbuf(icon, status_icons[si].pixbuf);
     }
 
+    void notify_of(StatusIcons si, const char* body, const char* summary)
+    {
+      if (!prefs.get_flag("use-notify", false)) return;
+#ifdef HAVE_LIBNOTIFY
+      NotifyNotification *notif(0);
+      bool show(false);
+      GError* error(0);
+      notif = notify_notification_new (summary, body, NULL);
+
+      switch (si)
+      {
+        case ICON_STATUS_ERROR:
+
+          show = true;
+          break;
+        case ICON_STATUS_NEW_ARTICLES:
+          show = true;
+          break;
+      }
+
+      notify_notification_set_icon_from_pixbuf(notif, status_icons[si].pixbuf);
+
+      if (show)
+        notify_notification_show (notif, &error);
+
+      if (error) {
+        debug ("Error showing notification: "<<error->message);
+        g_error_free (error);
+      }
+      g_object_unref (notif);
+#endif
+    }
+
     /* queue::listener */
     virtual void on_queue_task_active_changed (Queue&, Task&, bool active)
     {
@@ -259,6 +295,9 @@ namespace
       if (tasks_total == 0 || tasks_active == 0)
       {
         update_status_icon(ICON_STATUS_IDLE);
+        const char* summary = _("Error!");
+        const char* body = _("An error has occured. Maximize Pan to investigate.");
+        notify_of(ICON_STATUS_IDLE, body, summary);
       }
       update_status_tooltip();
     }
@@ -279,6 +318,9 @@ namespace
     virtual void on_group_counts (const Quark&, unsigned long, unsigned long)
     {
       update_status_icon(ICON_STATUS_NEW_ARTICLES);
+      const char* summary = _("New Articles!");
+      const char* body = _("There are new articles available.");
+      notify_of(ICON_STATUS_NEW_ARTICLES, body, summary);
     }
 
     private:
@@ -343,7 +385,7 @@ namespace
 
   void run_pan_with_status_icon (GtkWindow * window, GdkPixbuf * pixbuf, Queue& queue, Prefs & prefs, Data& data)
   {
-    for (guint i=0; i<ICON_NUM_STATUS_ICONS; ++i)
+    for (guint i=0; i<NUM_STATUS_ICONS; ++i)
         status_icons[i].pixbuf = gdk_pixbuf_new_from_inline (-1, status_icons[i].pixbuf_txt, FALSE, 0);
 
     GtkStatusIcon * icon = gtk_status_icon_new_from_pixbuf (status_icons[ICON_STATUS_IDLE].pixbuf);
@@ -635,9 +677,15 @@ main (int argc, char *argv[])
       gtk_window_set_default_icon (pixbuf);
       run_pan_with_status_icon(GTK_WINDOW(window), pixbuf, queue, prefs, data);
       g_object_unref (pixbuf);
+#ifdef HAVE_LIBNOTIFY
+      if (!notify_is_initted ())
+        notify_init (_("Pan notification"));
+#endif
       run_pan_in_window (data, queue, prefs, group_prefs, GTK_WINDOW(window));
     }
 
+    for (guint i=0; i<NUM_STATUS_ICONS; ++i)
+      g_object_unref(status_icons[i].pixbuf);
     delete _status_icon;
 
     worker_pool.cancel_all_silently ();
diff --git a/pan/gui/pan.ui.h b/pan/gui/pan.ui.h
index 83525de..5b46936 100644
--- a/pan/gui/pan.ui.h
+++ b/pan/gui/pan.ui.h
@@ -221,10 +221,5 @@ const char * fallback_ui_file =
 "    <separator />\n"
 "    <menuitem action='delete-groups-articles' />\n"
 "  </popup>\n"
-"  <popup name='tray-icon-popup'>\n"
-"    <menuitem action='quit-mainloop' />\n"
-"    <separator />\n"
-"    <menuitem action='work-online' />\n"
-"  </popup>\n"
 "\n"
 "</ui>\n";
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index a37971a..e343d6c 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -541,11 +541,14 @@ PrefsDialog :: PrefsDialog (Prefs& prefs, GtkWindow* parent):
     gtk_misc_set_alignment (GTK_MISC(l), 0.0, 0.5);
     gtk_label_set_mnemonic_widget(GTK_LABEL(l), w);
     HIG::workarea_add_row (t, &row, w, l);
-    HIG :: workarea_add_section_title (t, &row, _("Status Icon"));
-    HIG :: workarea_add_section_spacer (t, row, 3);
-    w = new_check_button (_("Hide window to system tray instead of closing it"), "status-icon", false, prefs);
+    HIG::workarea_add_section_divider (t, &row);
+    HIG :: workarea_add_section_title (t, &row, _("Systray Behaviour"));
+    HIG :: workarea_add_section_spacer (t, row, 2);
+    w = new_check_button (_("Hide to system tray"), "status-icon", false, prefs);
+    HIG :: workarea_add_wide_control (t, &row, w);
+    w = new_check_button (_("Start Pan minimized"), "start-minimized", false, prefs);
     HIG :: workarea_add_wide_control (t, &row, w);
-    w = new_check_button (_("Start Pan minimized"),  "start-minimized", false, prefs);
+    w = new_check_button (_("Show notifications"), "use-notify", false, prefs);
     HIG :: workarea_add_wide_control (t, &row, w);
   HIG :: workarea_finish (t, &row);
   gtk_notebook_append_page (GTK_NOTEBOOK(notebook), t, gtk_label_new_with_mnemonic(_("_Behavior")));
diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc
index e2c4e0c..f5810b6 100644
--- a/pan/gui/score-add-ui.cc
+++ b/pan/gui/score-add-ui.cc
@@ -104,16 +104,16 @@ namespace
   ***
   **/
 
-  enum { ADD, SUBTRACT, ASSIGN, WATCH, IGNORE };
+  enum { _ADD, _SUBTRACT, _ASSIGN, _WATCH, _IGNORE };
 
   GtkTreeModel * score_tree_model_new ()
   {
     struct { int type; const char * str; } items[] = {
-      { ADD,      N_("increase the article's score by") },
-      { SUBTRACT, N_("decrease the article's score by") },
-      { ASSIGN,   N_("set the article's score to") },
-      { WATCH,    N_("watch the article (set its score to 9999)") },
-      { IGNORE,   N_("ignore the article (set its score to -9999)") }
+      { _ADD,      N_("increase the article's score by") },
+      { _SUBTRACT, N_("decrease the article's score by") },
+      { _ASSIGN,   N_("set the article's score to") },
+      { _WATCH,    N_("watch the article (set its score to 9999)") },
+      { _IGNORE,   N_("ignore the article (set its score to -9999)") }
     };
 
     GtkListStore * store = gtk_list_store_new (VALUE_COLS, G_TYPE_STRING, G_TYPE_INT);
@@ -430,11 +430,11 @@ ScoreAddDialog :: add_this_to_scorefile (bool do_rescore)
   const int spin_score (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(_score_spin)));
   value = value_combo_get (GTK_COMBO_BOX(_score_menu));
   switch (value) {
-    case ADD:       assign_flag=false; score =  spin_score; break;
-    case SUBTRACT:  assign_flag=false; score = -spin_score; break;
-    case ASSIGN:    assign_flag=true;  score =  spin_score; break;
-    case WATCH:     assign_flag=true;  score =  9999;       break;
-    case IGNORE:    assign_flag=true;  score = -9999;       break;
+    case _ADD:       assign_flag=false; score =  spin_score; break;
+    case _SUBTRACT:  assign_flag=false; score = -spin_score; break;
+    case _ASSIGN:    assign_flag=true;  score =  spin_score; break;
+    case _WATCH:     assign_flag=true;  score =  9999;       break;
+    case _IGNORE:    assign_flag=true;  score = -9999;       break;
   }
 
   // duration in days
@@ -533,10 +533,10 @@ ScoreAddDialog :: populate (const Quark& group, const Article& a, Mode mode)
   // score
   int score_mode;
   switch (mode) {
-    case WATCH_SUBTHREAD: score_mode = WATCH; break;
+    case WATCH_SUBTHREAD: score_mode = _WATCH; break;
     case PLONK:
-    case IGNORE_SUBTHREAD: score_mode = IGNORE; break;
-    default: score_mode = ADD; break;
+    case IGNORE_SUBTHREAD: score_mode = _IGNORE; break;
+    default: score_mode = _ADD; break;
   }
   gtk_spin_button_set_value (GTK_SPIN_BUTTON(_score_spin), 100);
   value_combo_set (GTK_COMBO_BOX(_score_menu), score_mode);
@@ -582,7 +582,7 @@ namespace
     const int value = value_combo_get (w);
 
     GtkWidget * spin (GTK_WIDGET (spin_gpointer));
-    if (value==WATCH || value==IGNORE)
+    if (value==_WATCH || value==_IGNORE)
       gtk_widget_hide (spin);
     else
       gtk_widget_show (spin);
diff --git a/pan/tasks/decoder.cc b/pan/tasks/decoder.cc
index ece4f24..57be091 100644
--- a/pan/tasks/decoder.cc
+++ b/pan/tasks/decoder.cc
@@ -22,7 +22,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <config.h>
-//#include <algorithm>
 #include <cerrno>
 #include <ostream>
 #include <fstream>
@@ -31,6 +30,7 @@ extern "C" {
 #  include <uulib/uudeview.h>
 #  include <glib/gi18n.h>
 };
+#include <pan/general/worker-pool.h>
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/macros.h>
diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc
index 024425f..c9028e2 100644
--- a/pan/tasks/encoder.cc
+++ b/pan/tasks/encoder.cc
@@ -35,6 +35,7 @@ extern "C" {
 #include <sys/time.h>
 };
 
+#include <pan/general/worker-pool.h>
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
 #include <pan/general/macros.h>
diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc
index a0a7c92..5ab8156 100644
--- a/pan/tasks/socket-impl-main.cc
+++ b/pan/tasks/socket-impl-main.cc
@@ -4,6 +4,9 @@
  * Pan - A Newsreader for Gtk+
  * Copyright (C) 2002-2006  Charles Kerr <charles rebelbase com>
  *
+ * This file
+ * Copyright (C) 2011 Heinrich Mü<sphemuel stud informatik uni-erlangen de>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
@@ -41,12 +44,8 @@
 #include <pan/general/macros.h>
 #include <pan/general/worker-pool.h>
 #include <pan/general/string-view.h>
-
-#include <pthread.h>
-
 #include "socket-impl-main.h"
 
-
 using namespace pan;
 
 namespace pan
@@ -62,11 +61,11 @@ namespace pan
     Socket * socket;
     std::string err;
     bool use_ssl;
+    const Quark server;
 #ifdef HAVE_OPENSSL
     std::multimap<std::string, Socket*>& socket_map;
     SSL_CTX * context;
     CertStore& store;
-    const Quark server;
     ThreadWorker (const Quark& s, const StringView& h, int p, Socket::Creator::Listener *l,
                   bool ssl, SSL_CTX* ctx, CertStore& cs, std::multimap<std::string, Socket*>& m):
       server(s), host(h), port(p), listener(l), ok(false), socket(0), use_ssl(ssl), context(ctx), store(cs), socket_map(m) {}
@@ -77,14 +76,14 @@ namespace pan
 
     void do_work ()
     {
-      #ifdef HAVE_OPENSSL
+#ifdef HAVE_OPENSSL
         if (use_ssl)
         {
           socket = new GIOChannelSocketSSL (server, context, store);
           socket_map.insert(std::pair<std::string, Socket*>(host, socket));
         }
         else
-      #endif
+#endif
           socket = new GIOChannelSocket ();
       ok = socket->open (host, port, err);
     }
@@ -166,8 +165,8 @@ SocketCreator :: create_socket (const StringView & host,
 {
     Quark server;
     data.find_server_by_hn(host, server);
-    if (store.in_blacklist(server)) return;
     ensure_module_init ();
+    if (store.in_blacklist(server)) return;
 #ifdef HAVE_OPENSSL
     ThreadWorker * w = new ThreadWorker (server, host, port, listener, use_ssl, ssl_ctx, store, socket_map);
 #else
diff --git a/pan/tasks/socket-impl-main.h b/pan/tasks/socket-impl-main.h
index 315cc72..683d2b6 100644
--- a/pan/tasks/socket-impl-main.h
+++ b/pan/tasks/socket-impl-main.h
@@ -3,6 +3,9 @@
  * Pan - A Newsreader for Gtk+
  * Copyright (C) 2002-2006  Charles Kerr <charles rebelbase com>
  *
+ * This file
+ * Copyright (C) 2011 Heinrich Mü<sphemuel stud informatik uni-erlangen de>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc
index 1ca194f..60f38bb 100644
--- a/pan/tasks/socket-impl-openssl.cc
+++ b/pan/tasks/socket-impl-openssl.cc
@@ -3,6 +3,10 @@
  * Pan - A Newsreader for Gtk+
  * Copyright (C) 2002-2006  Charles Kerr <charles rebelbase com>
  *
+ * This file
+ * Copyright (C) 2011 Heinrich Mü<sphemuel stud informatik uni-erlangen de>
+ * SSL functions : Copyright (C) 2002 vjt (irssi project)
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
@@ -19,10 +23,6 @@
 
 /* #define DEBUG_SOCKET_IO */
 
-/** Copyright notice: Some code taken from here :
-  * http://dslinux.gits.kiev.ua/trunk/user/irssi/src/src/core/network-openssl.c
-  * Copyright (C) 2002 vjt (irssi project) */
-
 /******
 *******
 ******/
@@ -100,8 +100,8 @@ extern "C" {
 using namespace pan;
 
 #ifndef G_OS_WIN32
-extern void* p_getaddrinfo;
-extern void* p_freeaddrinfo;
+extern t_getaddrinfo p_getaddrinfo;
+extern t_freeaddrinfo p_freeaddrinfo;
 #endif
 
 /****
@@ -125,8 +125,9 @@ GIOChannelSocketSSL :: GIOChannelSocketSSL (const Quark& server, SSL_CTX* ctx, C
    _rehandshake(false),
    _server(server)
 {
-   cs.add_listener(this);
-   _session = cs.get_session();
+  debug ("GIOChannelSocketSSL ctor " << (void*)this);
+  cs.add_listener(this);
+  _session = cs.get_session();
 }
 
 
@@ -176,7 +177,7 @@ GIOChannelSocketSSL :: create_channel (const StringView& host_in, int port, std:
       server.sin_family = AF_INET;
       server.sin_port = htons(port);
       ++i;
-      err = connect (sockfd,(struct sockaddr*)&server, sizeof(server));
+      err = ::connect (sockfd,(struct sockaddr*)&server, sizeof(server));
     }
 
     if (err) {
@@ -803,12 +804,17 @@ GIOChannelSocketSSL :: ssl_get_iochannel(GIOChannel *handle, gboolean verify)
   gchan->read_buf = g_string_sized_new(4096*128);
 
   int ret;
+#ifndef G_OS_WIN32
   if ((ret = ssl_handshake(_server, gchan, this, &_certstore,
                            _host, _session, _rehandshake)) == 0)
   {
     g_io_channel_set_flags (handle, G_IO_FLAG_NONBLOCK, 0);
     return gchan;
   }
+#else
+  while (ssl_handshake(_server, gchan, this, &_certstore,_host, _session, _rehandshake)!=0) ;
+  return gchan;
+#endif
   return 0;
 }
 
diff --git a/pan/tasks/socket-impl-openssl.h b/pan/tasks/socket-impl-openssl.h
index bfb5485..3de0c55 100644
--- a/pan/tasks/socket-impl-openssl.h
+++ b/pan/tasks/socket-impl-openssl.h
@@ -3,6 +3,10 @@
  * Pan - A Newsreader for Gtk+
  * Copyright (C) 2002-2006  Charles Kerr <charles rebelbase com>
  *
+ * This file
+ * Copyright (C) 2011 Heinrich Mü<sphemuel stud informatik uni-erlangen de>
+ * SSL functions : Copyright (C) 2002 vjt (irssi project)
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
@@ -23,6 +27,7 @@
 #include <string>
 #include <glib/giochannel.h>
 #include <glib/gstring.h>
+#include <pan/general/debug.h>
 #include <pan/general/quark.h>
 #include <pan/tasks/socket.h>
 #include <pan/tasks/socket-impl-gio.h>
@@ -47,7 +52,7 @@ namespace pan
    */
 #ifdef HAVE_OPENSSL
   class GIOChannelSocketSSL:
-    public GIOChannelSocket,
+    public Socket,
     private CertStore::Listener
   {
     public:
@@ -102,7 +107,7 @@ namespace pan
   {
     public:
       virtual ~GIOChannelSocketSSL ();
-      GIOChannelSocketSSL ();
+      GIOChannelSocketSSL () { debug("SocketSSL stub ctor"); }
 #endif  // HAVE_OPENSSL
   };
 }
diff --git a/pan/usenet-utils/ssl-utils.h b/pan/usenet-utils/ssl-utils.h
index 0ceeab1..b4346dd 100644
--- a/pan/usenet-utils/ssl-utils.h
+++ b/pan/usenet-utils/ssl-utils.h
@@ -4,6 +4,12 @@
  * Pan - A Newsreader for Gtk+
  * Copyright (C) 2002-2006  Charles Kerr <charles rebelbase com>
  *
+ * This file
+ * Copyright (C) 2011 Heinrich Mü<sphemuel stud informatik uni-erlangen de>
+ * SSL functions : Copyright (C) 2002 vjt (irssi project)
+ * getTimeFromASN1 : Copyright (C) 2003 Jay Case,
+ * taken from : http://www.mail-archive.com/openssl-users openssl org/msg33365.html
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2 of the License.
@@ -18,10 +24,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/** Copyright notice: Some code taken from here :
-  * http://dslinux.gits.kiev.ua/trunk/user/irssi/src/src/core/network-openssl.c
-  * Copyright (C) 2002 vjt (irssi project) */
-
 #ifndef _SSL_UTILS_H_
 #define _SSL_UTILS_H_
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]