2007-02-09 [paul] 2.7.2cvs34

	* src/compose.c
		fix default hotkeys
	* src/prefs_other.c
	* src/prefs_send.c
		move "Never send Return Receipts" from
		prefs_other to prefs_send
		add an option "Ask about account specific
		filtering rules..." to prefs_other
	* src/gtk/gtkutils.c
		fix a compiler warning

diff --git a/ChangeLog b/ChangeLog
index e54d458ff92ae02d1c57c7b2fc31566d82225125..4e3f92ed35686d7f2b9d750fe96d90f2bbeb360a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-02-09 [paul]      2.7.2cvs34
+
+       * src/compose.c
+               fix default hotkeys
+       * src/prefs_other.c
+       * src/prefs_send.c
+               move "Never send Return Receipts" from
+               prefs_other to prefs_send
+               add an option "Ask about account specific
+               filtering rules..." to prefs_other
+       * src/gtk/gtkutils.c
+               fix a compiler warning
+
 2007-02-08 [colin]     2.7.2cvs33
 
        * src/plugins/pgpinline/pgpinline.c

diff --git a/PATCHSETS b/PATCHSETS
index f42b7a09a0d3bc7422f3565c86e05bd28c02dc05..7a84a8c0fdfea6f2415627a37926d5066e801ea4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2351,3 +2351,4 @@
 ( cvs diff -u -r 1.105.2.84 -r 1.105.2.85 src/prefs_account.c;  ) > 2.7.2cvs31.patchset
 ( cvs diff -u -r 1.149.2.64 -r 1.149.2.65 src/inc.c;  cvs diff -u -r 1.28.2.32 -r 1.28.2.33 src/mbox.c;  cvs diff -u -r 1.3.2.8 -r 1.3.2.9 src/mbox.h;  ) > 2.7.2cvs32.patchset
 ( cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpinline/pgpinline.c;  ) > 2.7.2cvs33.patchset
+( cvs diff -u -r 1.382.2.358 -r 1.382.2.359 src/compose.c;  cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/prefs_other.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/prefs_send.c;  cvs diff -u -r 1.5.2.52 -r 1.5.2.53 src/gtk/gtkutils.c;  ) > 2.7.2cvs34.patchset

diff --git a/configure.ac b/configure.ac
index 42ac3535f7da5e4b9c93796aa7bb5c1147cfd68f..63f99641efcb5f5210a95d258ff33d216204e7d3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index edf807979bed39e741c1eaff16b8c8add9d832b2..c0d2966c71f7205c79e19465821c438456adfd1e 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -547,7 +547,7 @@ static GtkItemFactoryEntry compose_popup_entries[] =
 static GtkItemFactoryEntry compose_entries[] =
 {
        {N_("/_Message"),                               NULL, NULL, 0, "<Branch>"},
-       {N_("/_Message/_Send"),         "<control>Return",
+       {N_("/_Message/S_end"),         "<control>Return",
                                        compose_send_cb, 0, NULL},
        {N_("/_Message/Send _later"),   "<shift><control>S",
                                        compose_send_later_cb,  0, NULL},

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index ad58fc985991d46714be58f5faec52cbcba8252f..3f7b3ad57e8e9d52d0d93aacfef76e76299dd36e 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1572,6 +1572,6 @@ GtkWidget *gtkut_window_new               (GtkWindowType   type,
                                         const gchar    *class)
 {
        GtkWidget *window = gtk_window_new(type);
-       gtk_window_set_wmclass(window, class, "Claws Mail");
+       gtk_window_set_wmclass(GTK_WINDOW(window), class, "Claws Mail");
        return window;
 }

diff --git a/src/prefs_other.c b/src/prefs_other.c
index a8fe4c76af9e950c85a313b677dcf059394e74ec..242d6c46b8ac45bc4fdf618567cebea076dec9e9 100644 (file)
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -56,8 +56,8 @@ typedef struct _OtherPage
         GtkWidget *checkbtn_cliplog;
        GtkWidget *spinbtn_loglength;
        GtkWidget *spinbtn_iotimeout;
-       GtkWidget *chkbtn_never_send_retrcpt;
-       GtkWidget *chkbtn_gtk_can_change_accels;
+       GtkWidget *checkbtn_gtk_can_change_accels;
+       GtkWidget *checkbtn_askonfilter;
 } OtherPage;
 
 static struct KeybindDialog {
@@ -503,10 +503,11 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *checkbtn_cleanonexit;
        GtkWidget *checkbtn_askonclean;
        GtkWidget *checkbtn_warnqueued;
+       GtkWidget *checkbtn_askonfilter;
 
        GtkWidget *frame_keys;
        GtkWidget *vbox_keys;
-       GtkWidget *chkbtn_gtk_can_change_accels;
+       GtkWidget *checkbtn_gtk_can_change_accels;
        GtkTooltips *gtk_can_change_accels_tooltip;
        GtkWidget *button_keybind;
 
@@ -514,8 +515,6 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *spinbtn_iotimeout;
        GtkObject *spinbtn_iotimeout_adj;
 
-       GtkWidget *chkbtn_never_send_retrcpt;
-
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
@@ -584,11 +583,11 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
 
        vbox_keys = gtkut_get_options_frame(vbox1, &frame_keys, _("Keyboard shortcuts"));
 
-       PACK_CHECK_BUTTON(vbox_keys, chkbtn_gtk_can_change_accels,
+       PACK_CHECK_BUTTON(vbox_keys, checkbtn_gtk_can_change_accels,
                        _("Enable customisable menu shortcuts"));
        gtk_can_change_accels_tooltip = gtk_tooltips_new();
        gtk_tooltips_set_tip(GTK_TOOLTIPS(gtk_can_change_accels_tooltip),
-                       chkbtn_gtk_can_change_accels,
+                       checkbtn_gtk_can_change_accels,
                        _("If checked, you can change the keyboard shortcuts of "
                                "most of the menu items by focusing on the menu "
                                "item and pressing a key combination.\n"
@@ -626,8 +625,13 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_widget_show (label_iotimeout);
        gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
 
-       PACK_CHECK_BUTTON(vbox1, chkbtn_never_send_retrcpt,
-                         _("Never send Return Receipts"));
+       hbox1 = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (hbox1);
+       gtk_box_pack_start (GTK_BOX (vbox1), hbox1, FALSE, FALSE, 0);
+
+       PACK_CHECK_BUTTON (hbox1, checkbtn_askonfilter,
+                          _("Ask about account specific filtering rules when "
+                            "filtering manually"));
 
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_addaddrbyclick), 
                prefs_common.add_address_by_click);
@@ -641,9 +645,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
                prefs_common.warn_queued_on_exit);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_cliplog), 
                prefs_common.cliplog);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_never_send_retrcpt),
-               prefs_common.never_send_retrcpt);
-       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chkbtn_gtk_can_change_accels),
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_gtk_can_change_accels),
                prefs_common.gtk_can_change_accels);
 
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_loglength),
@@ -651,6 +653,9 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_iotimeout),
                prefs_common.io_timeout_secs);
 
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_askonfilter), 
+               prefs_common.ask_apply_per_account_filtering_rules);
+
        prefs_other->checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
        prefs_other->checkbtn_confonexit = checkbtn_confonexit;
        prefs_other->checkbtn_cleanonexit = checkbtn_cleanonexit;
@@ -659,8 +664,8 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
        prefs_other->checkbtn_cliplog = checkbtn_cliplog;
        prefs_other->spinbtn_loglength = spinbtn_loglength;
        prefs_other->spinbtn_iotimeout = spinbtn_iotimeout;
-       prefs_other->chkbtn_never_send_retrcpt = chkbtn_never_send_retrcpt;
-       prefs_other->chkbtn_gtk_can_change_accels = chkbtn_gtk_can_change_accels;
+       prefs_other->checkbtn_gtk_can_change_accels = checkbtn_gtk_can_change_accels;
+       prefs_other->checkbtn_askonfilter = checkbtn_askonfilter;
 
        prefs_other->page.widget = vbox1;
 }
@@ -691,15 +696,16 @@ static void prefs_other_save(PrefsPage *_page)
 #ifdef HAVE_LIBETPAN
        imap_main_set_timeout(prefs_common.io_timeout_secs);
 #endif
-       prefs_common.never_send_retrcpt = gtk_toggle_button_get_active(
-               GTK_TOGGLE_BUTTON(page->chkbtn_never_send_retrcpt));
+       prefs_common.ask_apply_per_account_filtering_rules = 
+               gtk_toggle_button_get_active(
+                       GTK_TOGGLE_BUTTON(page->checkbtn_askonfilter)); 
 
        mainwindow = mainwindow_get_mainwindow();
        log_window_set_clipping(mainwindow->logwin, prefs_common.cliplog,
                                prefs_common.loglength);
 
        gtk_can_change_accels = gtk_toggle_button_get_active(
-               GTK_TOGGLE_BUTTON(page->chkbtn_gtk_can_change_accels));
+               GTK_TOGGLE_BUTTON(page->checkbtn_gtk_can_change_accels));
 
        if (prefs_common.gtk_can_change_accels != gtk_can_change_accels) {
 

diff --git a/src/prefs_send.c b/src/prefs_send.c
index ddb96cbd5228502b0baf4e9b4444adf05788e0b4..04f79dfdb0a0de13f9495cfeffd066a7a68bccab 100644 (file)
--- a/src/prefs_send.c
+++ b/src/prefs_send.c
@@ -48,6 +48,7 @@ typedef struct _SendPage
 
        GtkWidget *checkbtn_savemsg;
        GtkWidget *checkbtn_confirm_send_queued_messages;
+       GtkWidget *checkbtn_never_send_retrcpt;
        GtkWidget *optmenu_senddialog;
        GtkWidget *optmenu_charset;
        GtkWidget *optmenu_encoding_method;
@@ -128,6 +129,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        GtkWidget *menu;
        GtkWidget *optmenu_senddialog;
        GtkWidget *checkbtn_confirm_send_queued_messages;
+       GtkWidget *checkbtn_never_send_retrcpt;
        GtkWidget *table;
 
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
@@ -144,6 +146,9 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        PACK_CHECK_BUTTON (vbox2, checkbtn_confirm_send_queued_messages,
                        _("Confirm before sending queued messages"));
 
+       PACK_CHECK_BUTTON(vbox2, checkbtn_never_send_retrcpt,
+                         _("Never send Return Receipts"));
+
        table = gtk_table_new(3, 2, FALSE);
        gtk_widget_show(table);
        gtk_container_add (GTK_CONTAINER (vbox1), table);
@@ -282,6 +287,8 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
                prefs_common.savemsg);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_confirm_send_queued_messages),
                prefs_common.confirm_send_queued_messages);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_never_send_retrcpt),
+               prefs_common.never_send_retrcpt);
        gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_senddialog),
                prefs_common.send_dialog_mode);
        prefs_common_charset_set_optmenu(optmenu_charset, 
@@ -293,6 +300,7 @@ static void prefs_send_create_widget(PrefsPage *_page, GtkWindow *window,
        
        prefs_send->checkbtn_savemsg = checkbtn_savemsg;
        prefs_send->checkbtn_confirm_send_queued_messages = checkbtn_confirm_send_queued_messages;
+       prefs_send->checkbtn_never_send_retrcpt = checkbtn_never_send_retrcpt;
        prefs_send->optmenu_senddialog = optmenu_senddialog;
        prefs_send->optmenu_charset = optmenu_charset;
        prefs_send->optmenu_encoding_method = optmenu_encoding;
@@ -310,6 +318,8 @@ static void prefs_send_save(PrefsPage *_page)
                GTK_TOGGLE_BUTTON(page->checkbtn_savemsg));
        prefs_common.confirm_send_queued_messages = gtk_toggle_button_get_active(
                GTK_TOGGLE_BUTTON(page->checkbtn_confirm_send_queued_messages));
+       prefs_common.never_send_retrcpt = gtk_toggle_button_get_active(
+               GTK_TOGGLE_BUTTON(page->checkbtn_never_send_retrcpt));
 
        menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_senddialog));
        menuitem = gtk_menu_get_active(GTK_MENU(menu));