2007-11-18 [colin] 3.0.2cvs142

	* src/editaddress.c
		Fix possible "(null)" %s - thanks to wwp

diff --git a/ChangeLog b/ChangeLog
index 59ae420d77e04be7cd5e181d871c20b39ef5f5ab..d0bcc5e7ee2861ef9968e7754f98aa7d702a07f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-18 [colin]     3.0.2cvs142
+
+       * src/editaddress.c
+               Fix possible "(null)" %s - thanks to wwp
+
 2007-11-16 [wwp]       3.0.2cvs141
 
        * src/common/utils.c

diff --git a/PATCHSETS b/PATCHSETS
index bd5c08778cf911c3e8bb83c64bc02e92151e483b..220c2ab459c9c2b78584627fb4eabb75f3dd90ad 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3054,3 +3054,4 @@
 ( cvs diff -u -r 1.382.2.420 -r 1.382.2.421 src/compose.c;  cvs diff -u -r 1.36.2.123 -r 1.36.2.124 src/common/utils.c;  cvs diff -u -r 1.20.2.54 -r 1.20.2.55 src/common/utils.h;  ) > 3.0.2cvs139.patchset
 ( cvs diff -u -r 1.115.2.175 -r 1.115.2.176 src/main.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/common/claws.c;  ) > 3.0.2cvs140.patchset
 ( cvs diff -u -r 1.36.2.124 -r 1.36.2.125 src/common/utils.c;  ) > 3.0.2cvs141.patchset
+( cvs diff -u -r 1.14.2.43 -r 1.14.2.44 src/editaddress.c;  ) > 3.0.2cvs142.patchset

diff --git a/configure.ac b/configure.ac
index a862cf717974e988c7f0b94f107f915f7e0c95b3..d7d386112e3daedd1e91c90315d72fada5edb5c4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=141
+EXTRA_VERSION=142
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/editaddress.c b/src/editaddress.c
index 112a99e024d890416d6cc83476fb56882b3c7c4e..ff241d799801b49a803fa17e82a432e871a5419e 100644 (file)
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -1460,7 +1460,7 @@ static gboolean addressbook_edit_person_close( gboolean cancelled )
        {
                gchar *first = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 );
                gchar *last = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_last), 0, -1 );
-               cn = g_strdup_printf("%s%s%s", first, (first && last && *first && *last)?" ":"", last);
+               cn = g_strdup_printf("%s%s%s", first?first:"", (first && last && *first && *last)?" ":"", last?last:"");
                g_free(first);
                g_free(last);
        }