Revision 710 src/prefs_common_dialog.c

prefs_common_dialog.c (revision 710)
155 155
	GtkWidget *entry_junkfolder;
156 156
	GtkWidget *chkbtn_filter_on_recv;
157 157
	GtkWidget *chkbtn_delete_on_recv;
158
	GtkWidget *chkbtn_mark_as_read;
158 159
} junk;
159 160

  
160 161
#if USE_GPGME
......
386 387
	 prefs_set_data_from_toggle, prefs_set_toggle},
387 388
	{"delete_junk_on_receive", &junk.chkbtn_delete_on_recv,
388 389
	 prefs_set_data_from_toggle, prefs_set_toggle},
390
	{"mark_junk_as_read", &junk.chkbtn_mark_as_read,
391
	 prefs_set_data_from_toggle, prefs_set_toggle},
389 392

  
390 393
#if USE_GPGME
391 394
	/* Privacy */
......
1572 1575
	GtkWidget *btn_folder;
1573 1576
	GtkWidget *chkbtn_filter_on_recv;
1574 1577
	GtkWidget *chkbtn_delete_on_recv;
1578
	GtkWidget *chkbtn_mark_as_read;
1575 1579

  
1576 1580
	vbox1 = gtk_vbox_new (FALSE, VSPACING);
1577 1581
	gtk_widget_show (vbox1);
......
1633 1637

  
1634 1638
	PACK_VSPACER(vbox2, vbox3, 0);
1635 1639

  
1640
	PACK_SMALL_LABEL (vbox2, label,
1641
			  _("To classify junk mails automatically, both junk "
1642
			    "and not junk mails must be learned manually to "
1643
			    "a certain extent."));
1644

  
1645
	PACK_VSPACER(vbox2, vbox3, 0);
1646

  
1636 1647
	hbox = gtk_hbox_new (FALSE, 8);
1637 1648
	gtk_widget_show (hbox);
1638 1649
	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
......
1664 1675
	gtk_widget_show (vbox3);
1665 1676
	gtk_box_pack_start (GTK_BOX(vbox2), vbox3, FALSE, FALSE, 0);
1666 1677

  
1667
	PACK_CHECK_BUTTON(vbox3, chkbtn_filter_on_recv,
1668
			  _("Filter messages classified as junk on receiving"));
1669 1678
	PACK_CHECK_BUTTON
1679
		(vbox3, chkbtn_filter_on_recv,
1680
		 _("Filter messages classified as junk on receiving"));
1681
	PACK_CHECK_BUTTON
1670 1682
		(vbox3, chkbtn_delete_on_recv,
1671
		 _("Delete junk mails from server when filtered on receiving"));
1683
		 _("Delete junk mails from server on receiving"));
1672 1684
	SET_TOGGLE_SENSITIVITY (chkbtn_filter_on_recv, chkbtn_delete_on_recv);
1673 1685

  
1686
	PACK_CHECK_BUTTON (vbox3, chkbtn_mark_as_read,
1687
			   _("Mark filtered junk mails as read"));
1688

  
1674 1689
	junk.chkbtn_enable_junk    = chkbtn_enable_junk;
1675 1690
	junk.entry_junk_learncmd   = entry_junk_learncmd;
1676 1691
	junk.entry_nojunk_learncmd = entry_nojunk_learncmd;
......
1678 1693
	junk.entry_junkfolder      = entry_junkfolder;
1679 1694
	junk.chkbtn_filter_on_recv = chkbtn_filter_on_recv;
1680 1695
	junk.chkbtn_delete_on_recv = chkbtn_delete_on_recv;
1696
	junk.chkbtn_mark_as_read   = chkbtn_mark_as_read;
1681 1697
}
1682 1698

  
1683 1699
#if USE_GPGME

Also available in: Unified diff