2006-12-14 [colin] 2.6.1cvs35

	* src/main.c
		"Yes" should be the default choice for
		migration configuration

diff --git a/ChangeLog b/ChangeLog
index cd830dc3d27ddc0466393feefdafaccf76e8c764..7b238b2dc022383b9eb55b899602bbc9a63882db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-14 [colin]     2.6.1cvs35
+
+       * src/main.c
+               "Yes" should be the default choice for
+               migration configuration
+
 2006-12-14 [paul]      2.6.1cvs34
 
        * src/prefs_summaries.c

diff --git a/PATCHSETS b/PATCHSETS
index 1166c793060001dc11a48654e52e0e6809c5f9cd..23679c9e08f65710c32a8439f89bdc593a369d9a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2142,3 +2142,4 @@
 ( cvs diff -u -r 1.274.2.157 -r 1.274.2.158 src/mainwindow.c;  cvs diff -u -r 1.395.2.270 -r 1.395.2.271 src/summaryview.c;  cvs diff -u -r 1.68.2.29 -r 1.68.2.30 src/summaryview.h;  cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/gtk/quicksearch.c;  ) > 2.6.1cvs32.patchset
 ( cvs diff -u -r 1.94.2.111 -r 1.94.2.112 src/messageview.c;  cvs diff -u -r 1.19.2.11 -r 1.19.2.12 src/messageview.h;  cvs diff -u -r 1.83.2.93 -r 1.83.2.94 src/mimeview.c;  cvs diff -u -r 1.20.2.16 -r 1.20.2.17 src/mimeview.h;  cvs diff -u -r 1.395.2.271 -r 1.395.2.272 src/summaryview.c;  cvs diff -u -r 1.96.2.161 -r 1.96.2.162 src/textview.c;  cvs diff -u -r 1.12.2.15 -r 1.12.2.16 src/textview.h;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/gtksourceprintjob.c;  ) > 2.6.1cvs33.patchset
 ( cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/prefs_summaries.c;  cvs diff -u -r 1.1.2.36 -r 1.1.2.37 manual/advanced.xml;  ) > 2.6.1cvs34.patchset
+( cvs diff -u -r 1.115.2.119 -r 1.115.2.120 src/main.c;  ) > 2.6.1cvs35.patchset

diff --git a/configure.ac b/configure.ac
index 2e40fc3ec7a30dc1381eaef87359345cdb61919b..20d03faf7cc7b5ff02d205418f9e9eb10a6a907d 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=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index 8f75ea5064c2e08dd77460df687166a3429f6afe..14202eaba97084e79aa5265ec20b4af54ac46c21 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -273,7 +273,7 @@ static gboolean migrate_old_config(const gchar *old_cfg_dir, const gchar *new_cf
        GtkWidget *window = NULL;
        if (alertpanel(_("Migration of configuration"),
                       message,
-                      GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE) {
+                      GTK_STOCK_NO, "+" GTK_STOCK_YES, NULL) != G_ALERTALTERNATE) {
                return FALSE;
        }