2008-11-11 [colin] 3.6.1cvs22

	* src/summaryview.c
		Fix "display sender using addressbook" when
		prefs_common.swap_from is in use. Patch by
		H. Merijn Brand

diff --git a/ChangeLog b/ChangeLog
index e8e3ef633430c87d606154e72eab8edaf0f4615a..bcb34e50d388af1c0290175441b5aa61a7c06ac2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-11 [colin]     3.6.1cvs22
+
+       * src/summaryview.c
+               Fix "display sender using addressbook" when
+               prefs_common.swap_from is in use. Patch by
+               H. Merijn Brand
+
 2008-11-11 [colin]     3.6.1cvs21
 
        * src/autofaces.c

diff --git a/PATCHSETS b/PATCHSETS
index 823aa7aabf8ede6e302c03f1837e5b0ce3606ab5..9579c749d2e5f5a79c0b74bbe7f75a9322d897ce 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3603,3 +3603,4 @@
 ( cvs diff -u -r 1.274.2.288 -r 1.274.2.289 src/mainwindow.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 tools/claws.i18n.status.pl;  ) > 3.6.1cvs19.patchset
 ( cvs diff -u -r 1.5.10.26 -r 1.5.10.27 src/addrgather.c;  cvs diff -u -r 1.8.2.32 -r 1.8.2.33 src/editldap.c;  cvs diff -u -r 1.274.2.289 -r 1.274.2.290 src/mainwindow.c;  cvs diff -u -r 1.105.2.147 -r 1.105.2.148 src/prefs_account.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_logging.c;  cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/prefs_message.c;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/prefs_other.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/prefs_receive.c;  cvs diff -u -r 1.1.2.57 -r 1.1.2.58 src/prefs_summaries.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_wrapping.c;  cvs diff -u -r 1.395.2.397 -r 1.395.2.398 src/summaryview.c;  cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.23.2.51 -r 1.23.2.52 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.6.1cvs20.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/autofaces.c;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/common/md5.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/md5.h;  ) > 3.6.1cvs21.patchset
+( cvs diff -u -r 1.395.2.398 -r 1.395.2.399 src/summaryview.c;  ) > 3.6.1cvs22.patchset

diff --git a/configure.ac b/configure.ac
index 067faf50725dae269c47aeaf9f1f634a20b09f3a..dc72ce192aa9f58e05fd0acdc2a8d3501d7db694 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=22
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index 6ea31d309de9978291e86c15d0c3ed7fb7c84d19..e3d53adc9813fca149058e622a1a7442b2d5b2fa 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3362,6 +3362,16 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
        if (!should_swap) {
                text[col_pos[S_COL_FROM]] = from_text;
        } else {
+               if (prefs_common.use_addr_book) {
+                       gchar *tmp = summary_complete_address(to_text);
+                       if (tmp) {
+                               strncpy2(buf, tmp, sizeof(buf));
+                               g_free(tmp);
+                               to_text = buf;
+                       } else {
+                               to_text = to_text ? to_text : _("(No From)");
+                       }
+               }
                snprintf(tmp2, BUFFSIZE-1, "--> %s", to_text);
                tmp2[BUFFSIZE-1]='\0';
                text[col_pos[S_COL_FROM]] = tmp2;