2007-07-03 [paul] 2.10.0cvs3

	* src/compose.c
		fix auto-save
	* src/summaryview.c
		fix build warnings
	Thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index 7bdb8fcb8a14f4e730aaa69eb779123861f2d996..0e3363ec5b55f7bbfeccc5b06cfbe33caccc64a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-03 [paul]      2.10.0cvs3
+
+       * src/compose.c
+               fix auto-save
+       * src/summaryview.c
+               fix build warnings
+       Thanks to Colin
+
 2007-07-02 [colin]     2.10.0cvs2
 
        * src/folder.h

diff --git a/PATCHSETS b/PATCHSETS
index 0ba47b18f9bb7bae5ed7ef60c1bea8c65b1dcc93..da072d09a3659888e0c89808895bd4aff9e28b95 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2656,3 +2656,4 @@
 ( cvs diff -u -r 1.58.2.31 -r 1.58.2.32 po/de.po;  cvs diff -u -r 1.12.2.14 -r 1.12.2.15 po/en_GB.po;  cvs diff -u -r 1.60.2.44 -r 1.60.2.45 po/es.po;  cvs diff -u -r 1.42.2.31 -r 1.42.2.32 po/fr.po;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 po/hu.po;  cvs diff -u -r 1.50.2.25 -r 1.50.2.26 po/pt_BR.po;  cvs diff -u -r 1.17.2.14 -r 1.17.2.15 po/ru.po;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 po/zh_CN.po;  ) > 2.9.2cvs78.patchset
 ( cvs diff -u -r 1.155.2.65 -r 1.155.2.66 src/Makefile.am;  cvs diff -u -r 1.382.2.391 -r 1.382.2.392 src/compose.c;  diff -u /dev/null src/edittags.c;  diff -u /dev/null src/edittags.h;  cvs diff -u -r 1.60.2.32 -r 1.60.2.33 src/filtering.c;  cvs diff -u -r 1.213.2.145 -r 1.213.2.146 src/folder.c;  cvs diff -u -r 1.87.2.41 -r 1.87.2.42 src/folder.h;  cvs diff -u -r 1.8.2.20 -r 1.8.2.21 src/headerview.c;  cvs diff -u -r 1.2.2.2 -r 1.2.2.3 src/headerview.h;  cvs diff -u -r 1.115.2.155 -r 1.115.2.156 src/main.c;  cvs diff -u -r 1.274.2.191 -r 1.274.2.192 src/mainwindow.c;  cvs diff -u -r 1.39.2.37 -r 1.39.2.38 src/mainwindow.h;  cvs diff -u -r 1.8.2.6 -r 1.8.2.7 src/manual.h;  cvs diff -u -r 1.75.2.41 -r 1.75.2.42 src/matcher.c;  cvs diff -u -r 1.39.2.12 -r 1.39.2.13 src/matcher.h;  cvs diff -u -r 1.25.2.28 -r 1.25.2.29 src/matcher_parser_parse.y;  cvs diff -u -r 1.83.2.107 -r 1.83.2.108 src/mimeview.c;  cvs diff -u -r 1.16.2.50 -r 1.16.2.51 src/msgcache.c;  cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/msgcache.h;  cvs diff -u -r 1.204.2.137 -r 1.204.2.138 src/prefs_common.c;  cvs diff -u -r 1.103.2.84 -r 1.103.2.85 src/prefs_common.h;  cvs diff -u -r 1.1.4.36 -r 1.1.4.37 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.57 -r 1.43.2.58 src/prefs_matcher.c;  cvs diff -u -r 1.10.2.17 -r 1.10.2.18 src/prefs_summary_column.c;  cvs diff -u -r 1.150.2.98 -r 1.150.2.99 src/procmsg.c;  cvs diff -u -r 1.60.2.43 -r 1.60.2.44 src/procmsg.h;  cvs diff -u -r 1.8.2.19 -r 1.8.2.20 src/quote_fmt.c;  cvs diff -u -r 1.8.2.11 -r 1.8.2.12 src/quote_fmt_lex.l;  cvs diff -u -r 1.22.2.32 -r 1.22.2.33 src/quote_fmt_parse.y;  cvs diff -u -r 1.395.2.305 -r 1.395.2.306 src/summaryview.c;  cvs diff -u -r 1.68.2.37 -r 1.68.2.38 src/summaryview.h;  cvs diff -u -r 1.96.2.173 -r 1.96.2.174 src/textview.c;  cvs diff -u -r 1.24.2.13 -r 1.24.2.14 src/common/Makefile.am;  cvs diff -u -r 1.9.2.38 -r 1.9.2.39 src/common/defs.h;  diff -u /dev/null src/common/tags.c;  diff -u /dev/null src/common/tags.h;  cvs diff -u -r 1.1.2.72 -r 1.1.2.73 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/quicksearch.h;  ) > 2.10.0cvs1.patchset
 ( cvs diff -u -r 1.87.2.42 -r 1.87.2.43 src/folder.h;  cvs diff -u -r 1.274.2.192 -r 1.274.2.193 src/mainwindow.c;  cvs diff -u -r 1.60.2.44 -r 1.60.2.45 src/procmsg.h;  cvs diff -u -r 1.395.2.306 -r 1.395.2.307 src/summaryview.c;  ) > 2.10.0cvs2.patchset
+( cvs diff -u -r 1.382.2.392 -r 1.382.2.393 src/compose.c;  cvs diff -u -r 1.395.2.307 -r 1.395.2.308 src/summaryview.c;  ) > 2.10.0cvs3.patchset

diff --git a/configure.ac b/configure.ac
index fe57790cf9d1a1a410cddc5060a903187c8eb4e7..f877914f98c2fc8d0079ca1c501316257eabcfab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 6e52a7df7c8abcd1c6f095e07539458962afb68f..3503431b8a1f8e2af60a1b3ad5666d63856a1610 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1142,6 +1142,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        if (prefs_common.auto_exteditor)
                compose_exec_ext_editor(compose);
 
+       compose->draft_timeout_tag = -1;
        compose->modified = FALSE;
        compose_set_title(compose);
         return compose;

diff --git a/src/summaryview.c b/src/summaryview.c
index 125fcae53bab98c62d0ca7a113ee62c368518707..1b3b93db0fddd96d15da0f1e3bfb3f277a5d0c31 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -2452,8 +2452,7 @@ static void summary_set_column_titles(SummaryView *summaryview)
                SORT_BY_NUMBER,
                SORT_BY_SCORE,
                SORT_BY_LOCKED,
-               SORT_BY_TAGS,
-               SORT_BY_THREAD_DATE
+               SORT_BY_TAGS
        };
 
        for (pos = 0; pos < N_SUMMARY_COLS; pos++) {
@@ -2705,7 +2704,7 @@ static void summary_find_thread_age(GNode *gnode)
 {
        MsgInfo *msginfo = (MsgInfo *)gnode->data;
        time_t most_recent;
-       gchar b[256],b2[256];
+
        if (!msginfo)
                return;
        most_recent = msginfo->thread_date = msginfo->date_t;