2009-02-22 [colin] 3.7.0cvs69

	* src/addressbook.c
	* src/procmime.c
		More fixes

diff --git a/ChangeLog b/ChangeLog
index bd05c9a960b1ca8a75b4abd64d67ca56283689d1..8fb251f95b879708b1e21e59478a435bad731fd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-22 [colin]     3.7.0cvs69
+
+       * src/addressbook.c
+       * src/procmime.c
+               More fixes
+
 2009-02-22 [colin]     3.7.0cvs68
 
        * src/addrduplicates.c

diff --git a/PATCHSETS b/PATCHSETS
index 542ef79c57657b49b47b6980483c15ac349daa03..4e6acde083c219aba2edb12ab9a5151b5436f09a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3730,3 +3730,4 @@
 ( cvs diff -u -r 1.10.2.19 -r 1.10.2.20 src/privacy.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.1.2.61 -r 1.1.2.62 src/plugins/pgpcore/sgpgme.c;  ) > 3.7.0cvs66.patchset
 ( cvs diff -u -r 1.382.2.499 -r 1.382.2.500 src/compose.c;  ) > 3.7.0cvs67.patchset
 ( cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/addrduplicates.c;  cvs diff -u -r 1.60.2.130 -r 1.60.2.131 src/addressbook.c;  cvs diff -u -r 1.6.10.20 -r 1.6.10.21 src/addrharvest.c;  cvs diff -u -r 1.65.2.66 -r 1.65.2.67 src/codeconv.c;  cvs diff -u -r 1.382.2.500 -r 1.382.2.501 src/compose.c;  cvs diff -u -r 1.60.2.50 -r 1.60.2.51 src/filtering.c;  cvs diff -u -r 1.213.2.188 -r 1.213.2.189 src/folder.c;  cvs diff -u -r 1.179.2.239 -r 1.179.2.240 src/imap.c;  cvs diff -u -r 1.1.2.62 -r 1.1.2.63 src/imap_gtk.c;  cvs diff -u -r 1.14.2.22 -r 1.14.2.23 src/importldif.c;  cvs diff -u -r 1.18.2.28 -r 1.18.2.29 src/jpilot.c;  cvs diff -u -r 1.274.2.298 -r 1.274.2.299 src/mainwindow.c;  cvs diff -u -r 1.75.2.63 -r 1.75.2.64 src/matcher.c;  cvs diff -u -r 1.28.2.46 -r 1.28.2.47 src/mbox.c;  cvs diff -u -r 1.94.2.198 -r 1.94.2.199 src/messageview.c;  cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/mh_gtk.c;  cvs diff -u -r 1.204.2.186 -r 1.204.2.187 src/prefs_common.c;  cvs diff -u -r 1.59.2.76 -r 1.59.2.77 src/prefs_filtering.c;  cvs diff -u -r 1.10.2.39 -r 1.10.2.40 src/prefs_gtk.c;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/printing.c;  cvs diff -u -r 1.10.2.20 -r 1.10.2.21 src/privacy.c;  cvs diff -u -r 1.49.2.124 -r 1.49.2.125 src/procmime.c;  cvs diff -u -r 1.150.2.112 -r 1.150.2.113 src/procmsg.c;  cvs diff -u -r 1.395.2.407 -r 1.395.2.408 src/summaryview.c;  cvs diff -u -r 1.96.2.215 -r 1.96.2.216 src/textview.c;  cvs diff -u -r 1.13.2.19 -r 1.13.2.20 src/undo.c;  cvs diff -u -r 1.1.2.78 -r 1.1.2.79 src/wizard.c;  cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/common/md5.c;  cvs diff -u -r 1.13.2.43 -r 1.13.2.44 src/common/socket.c;  cvs diff -u -r 1.2.4.29 -r 1.2.4.30 src/common/template.c;  cvs diff -u -r 1.1.4.109 -r 1.1.4.110 src/etpan/imap-thread.c;  cvs diff -u -r 1.9.2.65 -r 1.9.2.66 src/gtk/gtkaspell.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.4.54 -r 1.1.4.55 src/gtk/gtksctree.c;  cvs diff -u -r 1.2.2.36 -r 1.2.2.37 src/gtk/inputdialog.c;  cvs diff -u -r 1.1.2.62 -r 1.1.2.63 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/plugins/pgpmime/pgpmime.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/smime/smime.c;  cvs diff -u -r 1.18.2.62 -r 1.18.2.63 src/plugins/spamassassin/spamassassin.c;  ) > 3.7.0cvs68.patchset
+( cvs diff -u -r 1.60.2.131 -r 1.60.2.132 src/addressbook.c;  cvs diff -u -r 1.49.2.125 -r 1.49.2.126 src/procmime.c;  ) > 3.7.0cvs69.patchset

diff --git a/configure.ac b/configure.ac
index 95aec71de7fa8610e862a0e3b6a4bb1c2f0a9bde..e28a85917d0b1400ce926a17be033538a9e23ac3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=68
+EXTRA_VERSION=69
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addressbook.c b/src/addressbook.c
index 084fc2f8d05125242020148f4edb3c6fd5d89894..3ba1594abf3ecf0d21f5331c110e12b3fdcb4bd8 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -3223,7 +3223,7 @@ static void addressbook_new_address_cb( GtkAction *action, gpointer data ) {
                                                                  addressbook_new_address_from_book_post_cb,
                                                                  TRUE );
 #ifdef USE_LDAP
-                       if (abf && abf->type == ADDR_IF_LDAP) {
+                       if (ds && abf && abf->type == ADDR_IF_LDAP) {
                                LdapServer *server = ds->rawDataSource;
                                ldapsvr_set_modified(server, TRUE);
                                ldapsvr_update_book(server, NULL);
@@ -3274,7 +3274,7 @@ static void addressbook_new_address_cb( GtkAction *action, gpointer data ) {
                                                          addressbook_new_address_from_folder_post_cb,
                                                          TRUE );
 #ifdef USE_LDAP
-               if (abf && abf->type == ADDR_IF_LDAP) {
+               if (ds && abf && abf->type == ADDR_IF_LDAP) {
                        LdapServer *server = ds->rawDataSource;
                        ldapsvr_set_modified(server, TRUE);
                        ldapsvr_update_book(server, NULL);

diff --git a/src/procmime.c b/src/procmime.c
index 80d92c35834239fe321fa40ae22a1fd91722f13b..e58ab44eef57850f869e83d424ce9870e706fd02 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1677,7 +1677,7 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                        while (value[strlen(value)-1] == ' ') 
                                value[strlen(value)-1] = '\0';
                }               
-               if (strrchr(down_attr, '*') != NULL) {
+               if (down_attr && strrchr(down_attr, '*') != NULL) {
                        gchar *tmpattr;
 
                        tmpattr = g_strdup(down_attr);
@@ -2182,6 +2182,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
                g_string_append_printf(buf, "%s=\"%s\"", param, val);
                break;
 
+#if 0 /* we don't use that for now */
        case ENC_AS_EXTENDED:
                if (!g_utf8_validate(val, -1, NULL))
                        g_string_append_printf(buf, "%s*=%s''", param,
@@ -2199,7 +2200,7 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data)
                        }
                }
                break;          
-
+#endif
        case ENC_AS_ENCWORD:
                len = MAX(strlen(val)*6, 512);
                tmp = g_malloc(len+1);