2007-02-23 [wwp] 2.7.2cvs65

	* src/addr_compl.c
		Add addresses to completion when they're non-empty (thanks to Colin).

diff --git a/ChangeLog b/ChangeLog
index 5cd008b4d879fb10af2f955ff48175d20caa1f08..90cf40d9dfbcc1fbdfa1ffd6376255f2f19cfdaa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-23 [wwp]       2.7.2cvs65
+
+       * src/addr_compl.c
+               Add addresses to completion when they're non-empty (thanks to Colin).
+
 2007-02-23 [paul]      2.7.2cvs64
 
        * src/plugins/pgpcore/passphrase.c

diff --git a/PATCHSETS b/PATCHSETS
index de8d3255163bb45726889337d23c8668788e26f9..8f4865c164f1661f6c4b8b9b51e8a6e7a8892e88 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2382,3 +2382,4 @@
 ( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/plugins/pgpcore/passphrase.c;  cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/sgpgme.h;  cvs diff -u -r 1.1.2.29 -r 1.1.2.30 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.45 -r 1.1.2.46 src/plugins/pgpmime/pgpmime.c;  ) > 2.7.2cvs62.patchset
 ( cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/prefs_gpg.h;  cvs diff -u -r 1.1.2.42 -r 1.1.2.43 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.46 -r 1.1.2.47 src/plugins/pgpmime/pgpmime.c;  ) > 2.7.2cvs63.patchset
 ( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/pgpcore/passphrase.c;  ) > 2.7.2cvs64.patchset
+( cvs diff -u -r 1.27.2.28 -r 1.27.2.29 src/addr_compl.c;  ) > 2.7.2cvs65.patchset

diff --git a/configure.ac b/configure.ac
index 770f1860839b2bf9faad2161b9e7ac255f82cf75..14d5bbc64e16bf8d8d247c606c54019b2bfcb52f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=64
+EXTRA_VERSION=65
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addr_compl.c b/src/addr_compl.c
index dbe78d7593a1536bcec5d4d53a726ea60ca74876..63bad19f7e9131d46fc34a25e8643449fb9db5b2 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -265,13 +265,13 @@ static gint add_address(const gchar *name, const gchar *address,
        g_address_list = g_list_prepend(g_address_list, ae);
 
        add_address1(name, ae);
-       if (address != NULL)
+       if (address != NULL && *address != '\0')
                add_address1(address, ae);
        
-       if (nick != NULL)
+       if (nick != NULL && *nick != '\0')
                add_address1(nick, ae);
        
-       if ( alias != NULL ) {
+       if ( alias != NULL && *alias != '\0') {
                add_address1(alias, ae);
        }