talons

commit a1c9025d287c1f785ef0a32aa14949ca5cc9b2d4
parent d31e1e9c45c480c877a52b2abe202141e3812fda
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 23 Jul 2008 17:54:48 +0000

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>

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/pgpcore/pgp_viewer.c
 | 
2
+-
M
src/plugins/pgpcore/sgpgme.c
 | 
2
+-

5 files changed, 11 insertions(+), 3 deletions(-)
diff --git 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
diff --git 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.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
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git 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
-#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
 
diff --git 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
-#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