2007-11-28 [wwp] 3.1.0cvs43

	* src/prefs_summary_open.c
		Guard against an empty list of actions to perform
		when opening a folder (or migration defaults could
		be introduced, confusing).

diff --git a/ChangeLog b/ChangeLog
index 612e86abf4c8be8589cce717610a2464dfa88b2d..d25c95a2834ee36e4ff038647f8df05be595b258 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-28 [wwp]       3.1.0cvs43
+
+       * src/prefs_summary_open.c
+               Guard against an empty list of actions to perform
+               when opening a folder (or migration defaults could
+               be introduced, confusing).
+
 2007-11-28 [colin]     3.1.0cvs42
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 070ad9fd9c540ff61a30742871e9bd0e9e930c41..3ebe837dfdb403fc6f01dfb91236b6dd6d3e307d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3100,3 +3100,4 @@
 ( cvs diff -u -r 1.213.2.169 -r 1.213.2.170 src/folder.c;  cvs diff -u -r 1.28.2.41 -r 1.28.2.42 src/mbox.c;  cvs diff -u -r 1.395.2.341 -r 1.395.2.342 src/summaryview.c;  ) > 3.1.0cvs40.patchset
 ( cvs diff -u -r 1.179.2.201 -r 1.179.2.202 src/imap.c;  cvs diff -u -r 1.34.2.18 -r 1.34.2.19 src/imap.h;  cvs diff -u -r 1.1.2.52 -r 1.1.2.53 src/imap_gtk.c;  cvs diff -u -r 1.105.2.117 -r 1.105.2.118 src/prefs_account.c;  cvs diff -u -r 1.1.4.89 -r 1.1.4.90 src/etpan/imap-thread.c;  ) > 3.1.0cvs41.patchset
 ( cvs diff -u -r 1.207.2.188 -r 1.207.2.189 src/folderview.c;  ) > 3.1.0cvs42.patchset
+( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_summary_open.c;  ) > 3.1.0cvs43.patchset

diff --git a/configure.ac b/configure.ac
index 693ecdded11bb125c6b7d1168ac782f770b21fb8..989c4298216f987f23c64d55cee6a1dc0a3b5107 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_summary_open.c b/src/prefs_summary_open.c
index ac027948ef2d23a72fd5d01919d2bfbe0ad9cd80..289b57bb667cb9bd35609aa76d5769a59f83e68f 100644 (file)
--- a/src/prefs_summary_open.c
+++ b/src/prefs_summary_open.c
@@ -388,7 +388,6 @@ static void prefs_summary_open_set_list(void)
        GtkTreeModel *model;
        GtkTreeIter iter;
 
-
        model = gtk_tree_view_get_model(GTK_TREE_VIEW(summaryopen.actions_list_view));
        while (gtk_tree_model_iter_nth_child(model, &iter, NULL, row)) {
                gtk_tree_model_get(model, &iter, PREFS_SUMMARY_OPEN_DATA, &data, -1);
@@ -535,6 +534,11 @@ static gboolean prefs_summary_open_key_pressed(GtkWidget *widget,
 static void prefs_summary_open_ok(void)
 {
        int i;
+
+       /* force an empty list to be at least ACTION_NONE */
+       if (prefs_common.summary_select_prio[0] == ACTION_UNSET)
+               prefs_common.summary_select_prio[0] = ACTION_NOTHING;
+
        for (i = 0; i < SUMMARY_OPEN_ACTIONS-1; i++)
                saved_summary_select_prio[i] = prefs_common.summary_select_prio[i];