* 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-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
2007-02-08 [colin] 2.7.2cvs33
* src/plugins/pgpinline/pgpinline.c
( 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.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
MICRO_VERSION=2
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=2
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
static GtkItemFactoryEntry compose_entries[] =
{
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
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},
compose_send_cb, 0, NULL},
{N_("/_Message/Send _later"), "<shift><control>S",
compose_send_later_cb, 0, NULL},
const gchar *class)
{
GtkWidget *window = gtk_window_new(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");
GtkWidget *checkbtn_cliplog;
GtkWidget *spinbtn_loglength;
GtkWidget *spinbtn_iotimeout;
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 {
} OtherPage;
static struct KeybindDialog {
GtkWidget *checkbtn_cleanonexit;
GtkWidget *checkbtn_askonclean;
GtkWidget *checkbtn_warnqueued;
GtkWidget *checkbtn_cleanonexit;
GtkWidget *checkbtn_askonclean;
GtkWidget *checkbtn_warnqueued;
+ GtkWidget *checkbtn_askonfilter;
GtkWidget *frame_keys;
GtkWidget *vbox_keys;
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;
GtkTooltips *gtk_can_change_accels_tooltip;
GtkWidget *button_keybind;
GtkWidget *spinbtn_iotimeout;
GtkObject *spinbtn_iotimeout_adj;
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);
vbox1 = gtk_vbox_new (FALSE, VSPACING);
gtk_widget_show (vbox1);
gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
vbox_keys = gtkut_get_options_frame(vbox1, &frame_keys, _("Keyboard shortcuts"));
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),
_("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"
_("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"
gtk_widget_show (label_iotimeout);
gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
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);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_addaddrbyclick),
prefs_common.add_address_by_click);
prefs_common.warn_queued_on_exit);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_cliplog),
prefs_common.cliplog);
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),
prefs_common.gtk_can_change_accels);
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_loglength),
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinbtn_iotimeout),
prefs_common.io_timeout_secs);
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;
prefs_other->checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
prefs_other->checkbtn_confonexit = checkbtn_confonexit;
prefs_other->checkbtn_cleanonexit = checkbtn_cleanonexit;
prefs_other->checkbtn_cliplog = checkbtn_cliplog;
prefs_other->spinbtn_loglength = spinbtn_loglength;
prefs_other->spinbtn_iotimeout = spinbtn_iotimeout;
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;
}
prefs_other->page.widget = vbox1;
}
#ifdef HAVE_LIBETPAN
imap_main_set_timeout(prefs_common.io_timeout_secs);
#endif
#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(
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) {
if (prefs_common.gtk_can_change_accels != gtk_can_change_accels) {
GtkWidget *checkbtn_savemsg;
GtkWidget *checkbtn_confirm_send_queued_messages;
GtkWidget *checkbtn_savemsg;
GtkWidget *checkbtn_confirm_send_queued_messages;
+ GtkWidget *checkbtn_never_send_retrcpt;
GtkWidget *optmenu_senddialog;
GtkWidget *optmenu_charset;
GtkWidget *optmenu_encoding_method;
GtkWidget *optmenu_senddialog;
GtkWidget *optmenu_charset;
GtkWidget *optmenu_encoding_method;
GtkWidget *menu;
GtkWidget *optmenu_senddialog;
GtkWidget *checkbtn_confirm_send_queued_messages;
GtkWidget *menu;
GtkWidget *optmenu_senddialog;
GtkWidget *checkbtn_confirm_send_queued_messages;
+ GtkWidget *checkbtn_never_send_retrcpt;
GtkWidget *table;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
GtkWidget *table;
vbox1 = gtk_vbox_new (FALSE, VSPACING);
PACK_CHECK_BUTTON (vbox2, checkbtn_confirm_send_queued_messages,
_("Confirm before sending queued messages"));
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);
table = gtk_table_new(3, 2, FALSE);
gtk_widget_show(table);
gtk_container_add (GTK_CONTAINER (vbox1), table);
prefs_common.savemsg);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_confirm_send_queued_messages),
prefs_common.confirm_send_queued_messages);
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,
gtk_option_menu_set_history(GTK_OPTION_MENU(optmenu_senddialog),
prefs_common.send_dialog_mode);
prefs_common_charset_set_optmenu(optmenu_charset,
prefs_send->checkbtn_savemsg = checkbtn_savemsg;
prefs_send->checkbtn_confirm_send_queued_messages = checkbtn_confirm_send_queued_messages;
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;
prefs_send->optmenu_senddialog = optmenu_senddialog;
prefs_send->optmenu_charset = optmenu_charset;
prefs_send->optmenu_encoding_method = optmenu_encoding;
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));
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));
menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(page->optmenu_senddialog));
menuitem = gtk_menu_get_active(GTK_MENU(menu));