2008-07-05 [colin] 3.5.0cvs10
authorColin Leroy <colin@colino.net>
Sat, 5 Jul 2008 10:02:56 +0000 (10:02 +0000)
committerColin Leroy <colin@colino.net>
Sat, 5 Jul 2008 10:02:56 +0000 (10:02 +0000)
* 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

ChangeLog
PATCHSETS
configure.ac
src/plugins/pgpcore/passphrase.c
src/plugins/pgpcore/prefs_gpg.c
src/plugins/pgpcore/select-keys.c

index d41b629..2575e5e 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
index 7848f33..ec97201 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 5e4083e..2c953d7 100644 (file)
@@ -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=
 
index 1250a39..5778f10 100644 (file)
 #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
index 2e8c3e4..67843c2 100644 (file)
@@ -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"
index 5c4bf57..8335aa4 100644 (file)
 #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"