2008-07-23 [colin] 3.5.0cvs31

	* src/plugins/pgpcore/pgp_viewer.c
	* src/plugins/pgpcore/sgpgme.c
		Fix bug 1681, 'GnuPG Plugin does not compile on solaris'
		Patch by Thomas Wiegner <wiegner@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 933295903d4e5f8e1a4eb01c06ec8a3361e4e7ca..e2e92b7beb963849d578d8c1f042e7f712959ef7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-23 [colin]     3.5.0cvs31
+
+       * src/plugins/pgpcore/pgp_viewer.c
+       * src/plugins/pgpcore/sgpgme.c
+               Fix bug 1681, 'GnuPG Plugin does not compile on solaris'
+               Patch by Thomas Wiegner <wiegner@gmx.de>
+

 2008-07-20 [paul]      3.5.0cvs30
 
        * src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
 2008-07-20 [paul]      3.5.0cvs30
 
        * src/plugins/trayicon/libeggtrayicon/eggtrayicon.c

diff --git a/PATCHSETS b/PATCHSETS
index ffe2bb720d36d450a65785d2638a7af69f699dba..4c182e8a7cfc8627c924fe8ddf43426bac6ca1e1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3442,3 +3442,4 @@
 ( cvs diff -u -r 1.5.10.23 -r 1.5.10.24 src/addrgather.c;  ) > 3.5.0cvs28.patchset
 ( cvs diff -u -r 1.207.2.202 -r 1.207.2.203 src/folderview.c;  cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/imap_gtk.c;  cvs diff -u -r 1.2.2.26 -r 1.2.2.27 src/news_gtk.c;  ) > 3.5.0cvs29.patchset
 ( cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 3.5.0cvs30.patchset
 ( cvs diff -u -r 1.5.10.23 -r 1.5.10.24 src/addrgather.c;  ) > 3.5.0cvs28.patchset
 ( cvs diff -u -r 1.207.2.202 -r 1.207.2.203 src/folderview.c;  cvs diff -u -r 1.1.2.58 -r 1.1.2.59 src/imap_gtk.c;  cvs diff -u -r 1.2.2.26 -r 1.2.2.27 src/news_gtk.c;  ) > 3.5.0cvs29.patchset
 ( cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c;  ) > 3.5.0cvs30.patchset

+( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpcore/pgp_viewer.c;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/plugins/pgpcore/sgpgme.c;  ) > 3.5.0cvs31.patchset

diff --git a/configure.ac b/configure.ac
index a1a8632edc41489b4571bc26660875e379373f80..b5ef48d3d3e9205aeef3d4ab953409f1012b81be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=30
+EXTRA_VERSION=31

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index d87e6c345e4327fcdd822f7a4dc8ac7c005d9001..43fdff6a1925adcb0be0ab17b11d857509c65388 100644 (file)
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -29,7 +29,7 @@
 #ifndef G_OS_WIN32
 #  include <sys/wait.h>
 #endif
 #ifndef G_OS_WIN32
 #  include <sys/wait.h>
 #endif

-#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
+#if (defined(__DragonFly__) || defined(SOLARIS) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))

 #  include <sys/signal.h>
 #endif
 
 #  include <sys/signal.h>
 #endif
 

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index e168590c61ee0221a0123336da2304934d374c4b..cebdfe638ef46ba16ca97f2741acdfba10c56054 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -36,7 +36,7 @@
 #ifndef G_OS_WIN32
 #  include <sys/wait.h>
 #endif
 #ifndef G_OS_WIN32
 #  include <sys/wait.h>
 #endif

-#if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
+#if (defined(__DragonFly__) || defined(SOLARIS) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))

 #  include <sys/signal.h>
 #endif
 #ifndef G_OS_WIN32
 #  include <sys/signal.h>
 #endif
 #ifndef G_OS_WIN32