2012-12-10 [mones] 3.9.0cvs45

	* src/addr_compl.c
		Fix bug #2835 (core part) to allow NULL names which
		have an address

diff --git a/ChangeLog b/ChangeLog
index edee01e713f7bf9bb50c2b6ee10e839d73f314f3..19432cfbc057c91c0fd35e27ed4b2e355f75ef1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-10 [mones]     3.9.0cvs45
+
+       * src/addr_compl.c
+               Fix bug #2835 (core part) to allow NULL names which
+               have an address
+
 2012-12-07 [colin]     3.9.0cvs44
 
        * src/news.c

diff --git a/PATCHSETS b/PATCHSETS
index 9eb077cbaba275f91ab3e34e6f6e1270bf8f8747..1d10ead0bec4116901583431d211cfa50df59d5e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4542,3 +4542,4 @@
 ( cvs diff -u -r 1.10.2.44 -r 1.10.2.45 src/prefs_gtk.c;  ) > 3.9.0cvs42.patchset
 ( cvs diff -u -r 1.30.2.33 -r 1.30.2.34 tools/README;  cvs diff -u -r 1.1 -r 1.2 tools/gif2xface.pl;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 tools/outlook2claws-mail.pl;  ) > 3.9.0cvs43.patchset
 ( cvs diff -u -r 1.101.2.75 -r 1.101.2.76 src/news.c;  ) > 3.9.0cvs44.patchset
+( cvs diff -u -r 1.27.2.66 -r 1.27.2.67 src/addr_compl.c;  ) > 3.9.0cvs45.patchset

diff --git a/configure.ac b/configure.ac
index ba886228e47e6ed2f0c95a9a8c900b4b6b4f4a45..fa54857d37c0052fd4e3aa8c4a219e59835393c3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=44
+EXTRA_VERSION=45
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addr_compl.c b/src/addr_compl.c
index de6731eb5ac7ff731e4a757f0b78ec7aba191b15..d7467aad1804c0a3dd68d0dbee07646abb477947 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -256,30 +256,30 @@ static gint add_address(const gchar *name, const gchar *address,
 {
        address_entry *ae;
 
-       if (!name || !address) {
-               if (address || nick || alias || !grp_emails) 
-                       return -1;
-       }
+       if (!address && !grp_emails)
+               return -1;
 
-       ae = g_new0(address_entry, 1);
+       if (!name)
+               name = "";
 
+       ae = g_new0(address_entry, 1);
        cm_return_val_if_fail(ae != NULL, -1);
 
-       ae->name    = g_strdup(name);
+       ae->name = g_strdup(name);
        ae->address = g_strdup(address);
        ae->grp_emails = grp_emails;
        g_address_list = g_list_prepend(g_address_list, ae);
 
        addr_compl_add_address1(name, ae);
+
        if (address != NULL && *address != '\0')
                addr_compl_add_address1(address, ae);
 
        if (nick != NULL && *nick != '\0')
                addr_compl_add_address1(nick, ae);
 
-       if ( alias != NULL && *alias != '\0') {
+       if (alias != NULL && *alias != '\0')
                addr_compl_add_address1(alias, ae);
-       }
 
        return 0;
 }