2008-07-05 [colin] 3.5.0cvs10

	* src/plugins/pgpcore/passphrase.c
	* src/plugins/pgpcore/prefs_gpg.c
	* src/plugins/pgpcore/select-keys.c
		Simplify GTK includes (with the advantage
		of compiling against GTK+2.13); patch by
		Charles A Edwards

diff --git a/ChangeLog b/ChangeLog
index d41b6292154d59067d8fb68b22343e9ce40ed822..2575e5e3dbac3812710974430350a1081bd57713 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-05 [colin]     3.5.0cvs10
+
+       * src/plugins/pgpcore/passphrase.c
+       * src/plugins/pgpcore/prefs_gpg.c
+       * src/plugins/pgpcore/select-keys.c
+               Simplify GTK includes (with the advantage
+               of compiling against GTK+2.13); patch by
+               Charles A Edwards
+

 2008-07-05 [colin]     3.5.0cvs9
 
        * src/wizard.c
 2008-07-05 [colin]     3.5.0cvs9
 
        * src/wizard.c

diff --git a/PATCHSETS b/PATCHSETS
index 7848f33218a2c0144b3eacbd1b8faf14ca2c2822..ec9720109992e7903ca52b73d21bcf777e964d79 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3421,3 +3421,4 @@
 ( cvs diff -u -r 1.105.2.135 -r 1.105.2.136 src/prefs_account.c;  ) > 3.5.0cvs7.patchset
 ( cvs diff -u -r 1.105.2.136 -r 1.105.2.137 src/prefs_account.c;  cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/common/session.h;  cvs diff -u -r 1.9.2.30 -r 1.9.2.31 src/common/ssl.c;  ) > 3.5.0cvs8.patchset
 ( cvs diff -u -r 1.1.2.69 -r 1.1.2.70 src/wizard.c;  ) > 3.5.0cvs9.patchset
 ( cvs diff -u -r 1.105.2.135 -r 1.105.2.136 src/prefs_account.c;  ) > 3.5.0cvs7.patchset
 ( cvs diff -u -r 1.105.2.136 -r 1.105.2.137 src/prefs_account.c;  cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/common/session.h;  cvs diff -u -r 1.9.2.30 -r 1.9.2.31 src/common/ssl.c;  ) > 3.5.0cvs8.patchset
 ( cvs diff -u -r 1.1.2.69 -r 1.1.2.70 src/wizard.c;  ) > 3.5.0cvs9.patchset

+( cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/pgpcore/select-keys.c;  ) > 3.5.0cvs10.patchset

diff --git a/configure.ac b/configure.ac
index 5e4083ebc5b2b643be1c93f5359fece4a9be9c00..2c953d7bcbef2f03d9f3817a2468052583ecce24 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=9
+EXTRA_VERSION=10

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index 1250a397f493d9488c507e2096092a676dc5fbe9..5778f10d5324f6dc49c9d7a517cb40668546d86c 100644 (file)
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -30,17 +30,7 @@
 #ifdef GDK_WINDOWING_X11
 #  include <gdk/gdkx.h>
 #endif /* GDK_WINDOWING_X11 */
 #ifdef GDK_WINDOWING_X11
 #  include <gdk/gdkx.h>
 #endif /* GDK_WINDOWING_X11 */

-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkfilesel.h>
-#include <gtk/gtksignal.h>
+#include <gtk/gtk.h> 

 #include <string.h>
 #include <sys/types.h>
 #ifdef G_OS_WIN32
 #include <string.h>
 #include <sys/types.h>
 #ifdef G_OS_WIN32

diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index 2e8c3e49f9b212f5150513864092c2907deaff41..67843c27d5f44e9ba9d78011f47e3856afe84993 100644 (file)
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -22,8 +22,7 @@
 #include <glib/gi18n.h>
 
 #include "defs.h"
 #include <glib/gi18n.h>
 
 #include "defs.h"

-#include "utils.h"
-#include "gtk/gtkutils.h"
+#include "utils.h" 

 #include "prefs.h"
 #include "prefs_gtk.h"
 #include "prefs_gpg.h"
 #include "prefs.h"
 #include "prefs_gtk.h"
 #include "prefs_gpg.h"

diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index 5c4bf57703642e8b073688907079b2f93c62ba80..8335aa4869b2f8b8868610f8bd3452045e42d981 100644 (file)
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -27,19 +27,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>

-#include <gtk/gtkmain.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkclist.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
-
+#include <gtk/gtk.h>

 #include "select-keys.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "select-keys.h"
 #include "utils.h"
 #include "gtkutils.h"