2007-01-17 [colin] 2.7.1cvs12

* src/plugins/pgpcore/select-keys.c
	* src/gtk/pluginwindow.c
	* src/prefs_account.c
		Fix warnings
This commit is contained in:
Colin Leroy 2007-01-17 07:25:33 +00:00
parent cb2c31445d
commit 1d91a34dc1
6 changed files with 11 additions and 3 deletions

View file

@ -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

View file

@ -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

View file

@ -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=

View file

@ -36,6 +36,7 @@
#include "prefs_common.h"
#include "../inc.h"
#include "manual.h"
#include "manage_window.h"
enum {
PLUGINWINDOW_NAME, /*<! plugin name */

View file

@ -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;

View file

@ -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));