commit 91d81ffad8fb6c3273131723778936bc0e19c95b
parent a9d8dc8125be2468811be692ee3baa43676e6295
Author: Colin Leroy <colin@colino.net>
Date: Sat, 5 Jul 2008 10:02:56 +0000
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
Diffstat:
6 files changed, 14 insertions(+), 27 deletions(-)
diff --git 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
diff --git 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.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
@@ -11,7 +11,7 @@ MINOR_VERSION=5
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=9
+EXTRA_VERSION=10
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git 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 */
-#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
diff --git 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 "utils.h"
-#include "gtk/gtkutils.h"
+#include "utils.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
@@ -27,19 +27,7 @@
#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"
