From 1d91a34dc1ac0c42645b217ac258f6097465e5b7 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 17 Jan 2007 07:25:33 +0000 Subject: [PATCH] 2007-01-17 [colin] 2.7.1cvs12 * src/plugins/pgpcore/select-keys.c * src/gtk/pluginwindow.c * src/prefs_account.c Fix warnings --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/pluginwindow.c | 1 + src/plugins/pgpcore/select-keys.c | 2 +- src/prefs_account.c | 1 - 6 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4bcd3ed20..6f5928852 100644 --- 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 55e38d5f7..25a4aef9e 100644 --- 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 0bfb7ce0e..b67332a0c 100644 --- 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 343d130e1..8cb392399 100644 --- 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, /*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 23b1b87b8..cb64f4051 100644 --- 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)); -- 2.25.1