2007-03-24 [wwp] 2.8.1cvs48

	* src/alertpanel.c
	* src/alertpanel.h
	* src/messageview.c
	* src/summaryview.c
		Fix wrong action performed when closing the
		"ask about account specific filtering rules
		when filtering manually" dialog by pressing Escape.
		Fix wrong order of buttons in the "return receipt
		notification - the message was sent to several of
		your accounts" dialog.

diff --git a/ChangeLog b/ChangeLog
index d87ba79f3b26a5a6c5e25a2beb8680a02dd55f0d..08232a584e3d347f67dea2a02548d11cdf00268c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-03-24 [wwp]       2.8.1cvs48
+
+       * src/alertpanel.c
+       * src/alertpanel.h
+       * src/messageview.c
+       * src/summaryview.c
+               Fix wrong action performed when closing the
+               "ask about account specific filtering rules
+               when filtering manually" dialog by pressing Escape.
+               Fix wrong order of buttons in the "return receipt
+               notification - the message was sent to several of
+               your accounts" dialog.
+

 2007-03-24 [paul]      2.8.1cvs47
 
        * src/folderview.c
 2007-03-24 [paul]      2.8.1cvs47
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index c1df825814732269e513cd34b9e1c78c28e75f1d..a632449b1ee3e8cfb2c875e588d853feb8c4820a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2464,3 +2464,4 @@
 ( cvs diff -u -r 1.43.2.62 -r 1.43.2.63 src/toolbar.c;  ) > 2.8.1cvs45.patchset
 ( cvs diff -u -r 1.155.2.57 -r 1.155.2.58 src/Makefile.am;  cvs diff -u -r 1.25.2.34 -r 1.25.2.35 src/stock_pixmap.c;  diff -u /dev/null src/pixmaps/edit_extern.xpm;  diff -u /dev/null src/pixmaps/mail_sign.xpm;  ) > 2.8.1cvs46.patchset
 ( cvs diff -u -r 1.207.2.154 -r 1.207.2.155 src/folderview.c;  cvs diff -u -r 1.2.2.9 -r 1.2.2.10 tools/kdeservicemenu/README;  ) > 2.8.1cvs47.patchset
 ( cvs diff -u -r 1.43.2.62 -r 1.43.2.63 src/toolbar.c;  ) > 2.8.1cvs45.patchset
 ( cvs diff -u -r 1.155.2.57 -r 1.155.2.58 src/Makefile.am;  cvs diff -u -r 1.25.2.34 -r 1.25.2.35 src/stock_pixmap.c;  diff -u /dev/null src/pixmaps/edit_extern.xpm;  diff -u /dev/null src/pixmaps/mail_sign.xpm;  ) > 2.8.1cvs46.patchset
 ( cvs diff -u -r 1.207.2.154 -r 1.207.2.155 src/folderview.c;  cvs diff -u -r 1.2.2.9 -r 1.2.2.10 tools/kdeservicemenu/README;  ) > 2.8.1cvs47.patchset

+( cvs diff -u -r 1.17.2.32 -r 1.17.2.33 src/alertpanel.c;  cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/alertpanel.h;  cvs diff -u -r 1.94.2.128 -r 1.94.2.129 src/messageview.c;  cvs diff -u -r 1.395.2.291 -r 1.395.2.292 src/summaryview.c;  ) > 2.8.1cvs48.patchset

diff --git a/configure.ac b/configure.ac
index d36bceb4faa2e2d1595b7df35883ca899c416d5a..51df89e67859637ddc80bec49e1be33e9b5802a0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=47
+EXTRA_VERSION=48

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/alertpanel.c b/src/alertpanel.c
index c1cafe6389d649d9363cde29d728fe7cbc9c5512..202dc975f80ca86aca7476319aebc95612b0cf04 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -74,12 +74,13 @@ AlertValue alertpanel_with_widget(const gchar *title,
                                  const gchar *button2_label,
                                  const gchar *button3_label,
                                  gboolean     can_disable,
                                  const gchar *button2_label,
                                  const gchar *button3_label,
                                  gboolean     can_disable,

-                                 GtkWidget *widget)
+                                 AlertValue   default_value,
+                                 GtkWidget   *widget)

 {
        return alertpanel_full(title, message, button1_label,
                                    button2_label, button3_label,
                                    can_disable, widget, ALERT_QUESTION,
 {
        return alertpanel_full(title, message, button1_label,
                                    button2_label, button3_label,
                                    can_disable, widget, ALERT_QUESTION,

-                                   G_ALERTDEFAULT);
+                                   default_value);

 }
 
 AlertValue alertpanel_full(const gchar *title, const gchar *message,
 }
 
 AlertValue alertpanel_full(const gchar *title, const gchar *message,

diff --git a/src/alertpanel.h b/src/alertpanel.h
index b7b18a0ee2995f835a50b609280fdd8043e0bfba..d2201757934d2fa96689b3316897fb70ab5ff56f 100644 (file)
--- a/src/alertpanel.h
+++ b/src/alertpanel.h
@@ -63,8 +63,8 @@ AlertValue alertpanel_with_widget     (const gchar *title,
                                         const gchar *button2_label,
                                         const gchar *button3_label,
                                         gboolean     can_disable,
                                         const gchar *button2_label,
                                         const gchar *button3_label,
                                         gboolean     can_disable,

-                                        GtkWidget *widget);
-
+                                        AlertValue   default_value,
+                                        GtkWidget   *widget);

 
 void alertpanel_notice (const gchar    *format,
                         ...) G_GNUC_PRINTF(1, 2);
 
 void alertpanel_notice (const gchar    *format,
                         ...) G_GNUC_PRINTF(1, 2);

diff --git a/src/messageview.c b/src/messageview.c
index 1dd3107cd9074a56d3de68f45336028be8cfa9be..e7ace69453b098622dced41b51679aa2ee32bfd6 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1402,8 +1402,8 @@ static PrefsAccount *select_account_from_list(GList *ac_list)
                                  "accounts.\n"
                                  "Please choose which account do you want to "
                                  "use for sending the receipt notification:"),
                                  "accounts.\n"
                                  "Please choose which account do you want to "
                                  "use for sending the receipt notification:"),

-                               _("_Send Notification"), _("+_Cancel"), NULL,
-                               FALSE, optmenu) != G_ALERTDEFAULT)
+                               _("_Cancel"), _("_Send Notification"), NULL,
+                               FALSE, G_ALERTDEFAULT, optmenu) != G_ALERTALTERNATE)

                return NULL;
        return account_find_from_id(account_id);
 }
                return NULL;
        return account_find_from_id(account_id);
 }

diff --git a/src/summaryview.c b/src/summaryview.c
index ec37f8b25139ac90f1fa56bc8a52518e2c941f7f..83792262fa1de147f32089651878752143828d1d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -4802,8 +4802,9 @@ static gboolean summary_filter_get_mode(void)
                        _("Filtering"),
                        _("There are some filtering rules that belong to an account.\n"
                          "Please choose what to do with these rules:"),
                        _("Filtering"),
                        _("There are some filtering rules that belong to an account.\n"
                          "Please choose what to do with these rules:"),

-                       GTK_STOCK_CANCEL, _("+_Filter"), NULL, TRUE, vbox);
-       if ((val & ~G_ALERTDISABLE) == G_ALERTDEFAULT) {
+                       GTK_STOCK_CANCEL, _("_Filter"), NULL, TRUE, G_ALERTALTERNATE, vbox);
+
+       if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE) {

                return FALSE;
        } else if (val & G_ALERTDISABLE)
                prefs_common.ask_apply_per_account_filtering_rules = FALSE;
                return FALSE;
        } else if (val & G_ALERTDISABLE)
                prefs_common.ask_apply_per_account_filtering_rules = FALSE;