2006-07-04 [colin] 2.3.1cvs55

	* src/folderview.c
		Feedback when closing (for big folders)
	* src/prefs_actions.c
	* src/prefs_filtering.c
	* src/prefs_matcher.c
	* src/prefs_template.c
		Fix default button when closing without
		having saved

diff --git a/ChangeLog b/ChangeLog
index 21b2ca041ef2434e644828b10ec4ea1841941086..793838a9e01b535cc3a3b7f9c333c91255c6c3d3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-04 [colin]     2.3.1cvs55
+
+       * src/folderview.c
+               Feedback when closing (for big folders)
+       * src/prefs_actions.c
+       * src/prefs_filtering.c
+       * src/prefs_matcher.c
+       * src/prefs_template.c
+               Fix default button when closing without
+               having saved
+
 2006-07-04 [colin]     2.3.1cvs54
 
        * src/news.c

diff --git a/PATCHSETS b/PATCHSETS
index 6cc18593122d3ac46f5c8767f54f79e10e24182a..17841faa722de73df435b11f80547fea6d1206f7 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1655,3 +1655,4 @@
 ( cvs diff -u -r 1.382.2.291 -r 1.382.2.292 src/compose.c;  cvs diff -u -r 1.10.2.9 -r 1.10.2.10 src/privacy.c;  cvs diff -u -r 1.10.2.8 -r 1.10.2.9 src/privacy.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/plugins/pgpmime/pgpmime.c;  ) > 2.3.1cvs52.patchset
 ( cvs diff -u -r 1.207.2.106 -r 1.207.2.107 src/folderview.c;  cvs diff -u -r 1.115.2.93 -r 1.115.2.94 src/main.c;  ) > 2.3.1cvs53.patchset
 ( cvs diff -u -r 1.101.2.26 -r 1.101.2.27 src/news.c;  ) > 2.3.1cvs54.patchset
+( cvs diff -u -r 1.207.2.107 -r 1.207.2.108 src/folderview.c;  cvs diff -u -r 1.60.2.34 -r 1.60.2.35 src/prefs_actions.c;  cvs diff -u -r 1.59.2.34 -r 1.59.2.35 src/prefs_filtering.c;  cvs diff -u -r 1.43.2.39 -r 1.43.2.40 src/prefs_matcher.c;  cvs diff -u -r 1.12.2.25 -r 1.12.2.26 src/prefs_template.c;  ) > 2.3.1cvs55.patchset

diff --git a/configure.ac b/configure.ac
index e5040128a12ebd8735100a47226de7f868322281..2640dc637c2b5f69a1f639f4c4eef242adec3aca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=54
+EXTRA_VERSION=55
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 4e645a50e250dd95617e4f1fdacf0f90bb0e5580..bee150d4f64794cbb102aa6d85123b8097af8f27 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2027,10 +2027,17 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
                
                olditem = gtk_ctree_node_get_row_data(ctree, folderview->opened);
                if (olditem) {
+                       buf = g_strdup_printf(_("Closing Folder %s..."), 
+                               olditem->path ? olditem->path:olditem->name);
                        /* will be null if we just moved the previously opened folder */
+                       STATUSBAR_PUSH(folderview->mainwin, buf);
+                       main_window_cursor_wait(folderview->mainwin);
+                       g_free(buf);
                        summary_save_prefs_to_folderitem(folderview->summaryview, olditem);
                        summary_show(folderview->summaryview, NULL);
                        folder_item_close(olditem);
+                       main_window_cursor_normal(folderview->mainwin);
+                       STATUSBAR_POP(folderview->mainwin);
                }
        }
 

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 89d7a16358560464c0bc8571e59e7109fc0f836c..ccd4453d4a806c56af8d163d03a90c465d12cca7 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -730,7 +730,7 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data)
 {
        if (modified && alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_CLOSE, _("_Continue editing"),
+                                GTK_STOCK_CLOSE, _("+_Continue editing"),
                                 NULL) != G_ALERTDEFAULT) {
                return;
        }
@@ -750,7 +750,7 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
 
        if (modified && alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_CLOSE, _("_Continue editing"),
+                                GTK_STOCK_CLOSE, _("+_Continue editing"),
                                 NULL) != G_ALERTDEFAULT) {
                return;
        }

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 478f28039fc5a07bc1796c438b981f02ebff64ff..e1b4cb7c1063a3abcd44d80269e6247d270834c0 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -1101,7 +1101,7 @@ static void prefs_filtering_ok(void)
                if (!filtering_str) {
                        val = alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_CLOSE, _("_Continue editing"), NULL);
+                                GTK_STOCK_CLOSE, _("+_Continue editing"), NULL);
                        if (G_ALERTDEFAULT != val) {
                                g_free(filtering_str);
                                g_free(str); /* fixed two leaks: huzzah! */
@@ -1123,7 +1123,7 @@ static void prefs_filtering_ok(void)
                    strlen(action)) {
                        val = alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_CLOSE, _("_Continue editing"), NULL);
+                                GTK_STOCK_CLOSE, _("+_Continue editing"), NULL);
                        if (G_ALERTDEFAULT != val) {
                                g_free(name);
                                g_free(condition);

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 442e402e4eeb3a206c965896685af48170a7ca07..020089301e93bf7f8c4da6c67550ef8fb4f11206 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -1639,7 +1639,7 @@ static void prefs_matcher_ok(void)
                                if (!matcher_str || strcmp(matcher_str, str) != 0) {
                                        val = alertpanel(_("Entry not saved"),
                                                         _("The entry was not saved.\nClose anyway?"),
-                                                        GTK_STOCK_CLOSE, _("_Continue editing"), NULL);
+                                                        GTK_STOCK_CLOSE, _("+_Continue editing"), NULL);
                                        if (G_ALERTDEFAULT != val) {
                                                g_free(matcher_str);                                             
                                                g_free(str);

diff --git a/src/prefs_template.c b/src/prefs_template.c
index 869068c60fd548f8430caa4bde244c98cf144fdb..9654acc20aa8a45d2e31cc8a4817d99d59c63e64 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -403,7 +403,7 @@ static void prefs_template_ok_cb(void)
 
        if (modified && alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_CLOSE, _("_Continue editing"), 
+                                GTK_STOCK_CLOSE, _("+_Continue editing"), 
                                 NULL) != G_ALERTDEFAULT) {
                return;
        }
@@ -420,7 +420,7 @@ static void prefs_template_cancel_cb(void)
 {
        if (modified && alertpanel(_("Entry not saved"),
                                 _("The entry was not saved. Close anyway?"),
-                                GTK_STOCK_CLOSE, _("_Continue editing"),
+                                GTK_STOCK_CLOSE, _("+_Continue editing"),
                                 NULL) != G_ALERTDEFAULT) {
                return;
        }