2007-01-17 [colin] 2.7.1cvs12

	* src/plugins/pgpcore/select-keys.c
	* src/gtk/pluginwindow.c
	* src/prefs_account.c
		Fix warnings

diff --git a/ChangeLog b/ChangeLog
index 4bcd3ed20c82cbc43f5630f7734ed424647987e4..6f59288520f73a01d25d07a5c2df8e72039ba492 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-17 [colin]     2.7.1cvs12
+
+       * src/plugins/pgpcore/select-keys.c
+       * src/gtk/pluginwindow.c
+       * src/prefs_account.c
+               Fix warnings
+
 2007-01-16 [colin]     2.7.1cvs11
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 55e38d5f7a41642bbe3d6b6ce84a2060cb9d1c93..25a4aef9e4c25209c37d87491621e11266ba2040 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2269,3 +2269,4 @@
 ( cvs diff -u -r 1.179.2.151 -r 1.179.2.152 src/imap.c;  ) > 2.7.1cvs9.patchset
 ( cvs diff -u -r 1.207.2.142 -r 1.207.2.143 src/folderview.c;  ) > 2.7.1cvs10.patchset
 ( cvs diff -u -r 1.179.2.152 -r 1.179.2.153 src/imap.c;  cvs diff -u -r 1.34.2.11 -r 1.34.2.12 src/imap.h;  cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/imap_gtk.c;  ) > 2.7.1cvs11.patchset
+( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.5.2.41 -r 1.5.2.42 src/gtk/pluginwindow.c;  cvs diff -u -r 1.105.2.80 -r 1.105.2.81 src/prefs_account.c;  ) > 2.7.1cvs12.patchset

diff --git a/configure.ac b/configure.ac
index 0bfb7ce0ec626dcb28bbefd80ad1a45220fbe46d..b67332a0cf27796c1e8a2556bd6044d1c69f95ef 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index 343d130e10b708cde8014c81572b5491345172ce..8cb392399500a23dda52e23980f5be999a185cf0 100644 (file)
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -36,6 +36,7 @@
 #include "prefs_common.h"
 #include "../inc.h"
 #include "manual.h"
+#include "manage_window.h"
 
 enum {
        PLUGINWINDOW_NAME,              /*<! plugin name */

diff --git a/src/plugins/pgpcore/select-keys.c b/src/plugins/pgpcore/select-keys.c
index 78c732916b293395875ba63041d24ad4833443e9..4ba1f3d205a11805d16c9961406a74e1db436516 100644 (file)
--- a/src/plugins/pgpcore/select-keys.c
+++ b/src/plugins/pgpcore/select-keys.c
@@ -226,7 +226,7 @@ set_row (GtkCList *clist, gpgme_key_t key, gpgme_protocol_t proto)
     }
     text[COL_NAME] = s;
 
-    if (proto == GPGME_PROTOCOL_CMS && !key->uids->email || !*key->uids->email) {
+    if (proto == GPGME_PROTOCOL_CMS && (!key->uids->email || !*key->uids->email)) {
        gpgme_user_id_t uid = key->uids->next;
        if (uid)
                s = uid->email;

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 23b1b87b81665e4a0f22d854009325e42d01f2b9..cb64f4051a5dcb5cc7ac965be878b49f30efcb2f 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -2568,7 +2568,6 @@ static gint prefs_account_apply(void)
        gchar *new_id = NULL;
        struct BasicProtocol *protocol_optmenu = (struct BasicProtocol *) basic.protocol_optmenu;
        GtkWidget *optmenu = protocol_optmenu->combobox;
-       gboolean old_subsonly = TRUE;
 
        protocol = combobox_get_active_data(GTK_COMBO_BOX(optmenu));