2006-08-09 [colin] 2.4.0cvs37

* src/prefs_filtering.c
		Warning fix, patch by Paul
	* src/messageview.c
	* src/prefs_actions.c
	* src/prefs_filtering_action.c
	* src/prefs_matcher.c
		Uniformisation of "Info ..." to "Info..." (for
		old gtk), patch by Fabien
	* src/plugins/clamav/clamav_plugin_gtk.c
		Sensitivity fix by Fabien
This commit is contained in:
Colin Leroy 2006-08-09 19:05:06 +00:00
parent 85623aa1b4
commit e8f846e928
9 changed files with 20 additions and 8 deletions

View file

@ -1,3 +1,16 @@
2006-08-09 [colin] 2.4.0cvs37
* src/prefs_filtering.c
Warning fix, patch by Paul
* src/messageview.c
* src/prefs_actions.c
* src/prefs_filtering_action.c
* src/prefs_matcher.c
Uniformisation of "Info ..." to "Info..." (for
old gtk), patch by Fabien
* src/plugins/clamav/clamav_plugin_gtk.c
Sensitivity fix by Fabien
2006-08-09 [colin] 2.4.0cvs36
* src/main.c

View file

@ -1728,3 +1728,4 @@
( cvs diff -u -r 1.382.2.298 -r 1.382.2.299 src/compose.c; ) > 2.4.0cvs34.patchset
( cvs diff -u -r 1.94.2.95 -r 1.94.2.96 src/messageview.c; cvs diff -u -r 1.83.2.77 -r 1.83.2.78 src/mimeview.c; cvs diff -u -r 1.20.2.12 -r 1.20.2.13 src/mimeview.h; cvs diff -u -r 1.16.2.33 -r 1.16.2.34 src/msgcache.c; ) > 2.4.0cvs35.patchset
( cvs diff -u -r 1.115.2.99 -r 1.115.2.100 src/main.c; cvs diff -u -r 1.7.2.3 -r 1.7.2.4 src/main.h; cvs diff -u -r 1.14.2.34 -r 1.14.2.35 src/plugins/trayicon/trayicon.c; ) > 2.4.0cvs36.patchset
( cvs diff -u -r 1.94.2.96 -r 1.94.2.97 src/messageview.c; cvs diff -u -r 1.60.2.38 -r 1.60.2.39 src/prefs_actions.c; cvs diff -u -r 1.59.2.39 -r 1.59.2.40 src/prefs_filtering.c; cvs diff -u -r 1.1.4.27 -r 1.1.4.28 src/prefs_filtering_action.c; cvs diff -u -r 1.43.2.42 -r 1.43.2.43 src/prefs_matcher.c; cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/plugins/clamav/clamav_plugin_gtk.c; ) > 2.4.0cvs37.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=4
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=36
EXTRA_VERSION=37
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -870,7 +870,7 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
if (mimeinfo && (mimeinfo->type != MIMETYPE_TEXT ||
strcasecmp(mimeinfo->subtype, "plain"))) {
if (strcasecmp(mimeinfo->subtype, "html"))
mimeview_select_mimepart_icon(messageview->mimeview,mimeinfo);
mimeview_show_part(messageview->mimeview,mimeinfo);
else if (prefs_common.invoke_plugin_on_html)
mimeview_select_mimepart_icon(messageview->mimeview,mimeinfo);
}

View file

@ -141,7 +141,6 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
gtk_tooltips_set_tip(tooltips, save_folder,
_("Folder for storing infected mail. Leave empty to use the default trash folder"),
NULL);
SET_TOGGLE_SENSITIVITY (recv_infected, save_folder);
SET_TOGGLE_SENSITIVITY (enable_clamav, save_folder);
save_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
@ -150,7 +149,6 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
gtk_tooltips_set_tip(tooltips, save_folder_select,
_("Click this button to select a folder for storing infected mail"),
NULL);
SET_TOGGLE_SENSITIVITY (recv_infected, save_folder_select);
SET_TOGGLE_SENSITIVITY (enable_clamav, save_folder_select);
config = clamav_get_config();

View file

@ -280,7 +280,7 @@ static void prefs_actions_create(MainWindow *mainwin)
#if GTK_CHECK_VERSION(2, 8, 0)
info_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
#else
info_btn = gtk_button_new_with_label(_("Info ..."));
info_btn = gtk_button_new_with_label(_("Info..."));
#endif
gtk_widget_show(info_btn);
gtk_box_pack_end(GTK_BOX(reg_hbox), info_btn, FALSE, FALSE, 0);

View file

@ -238,7 +238,7 @@ static void prefs_filtering_account_option_menu_populate(void)
accounts = account_get_list();
g_return_val_if_fail(accounts != NULL, NULL);
g_return_if_fail(accounts != NULL);
COMBOBOX_ADD(filtering.account_combobox_list, Q_("Filtering Account Menu|All"), 0);
for (; accounts != NULL; accounts = accounts->next) {

View file

@ -461,7 +461,7 @@ static void prefs_filtering_action_create(void)
#if GTK_CHECK_VERSION(2, 8, 0)
exec_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
#else
exec_btn = gtk_button_new_with_label (_("Info ..."));
exec_btn = gtk_button_new_with_label (_("Info..."));
#endif
gtk_widget_show (exec_btn);
gtk_box_pack_start (GTK_BOX (hbox1), exec_btn, FALSE, FALSE, 0);

View file

@ -566,7 +566,7 @@ static void prefs_matcher_create(void)
#if GTK_CHECK_VERSION(2, 8, 0)
test_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
#else
test_btn = gtk_button_new_with_label(_(" Info... "));
test_btn = gtk_button_new_with_label(_("Info..."));
#endif
gtk_widget_show(test_btn);
gtk_table_attach(GTK_TABLE (criteria_table), test_btn, 3, 4, 1, 2,