+2006-04-25 [cleroy] 2.1.1cvs34
+
+ * src/compose.c
+ * src/gtk/gtkaspell.c
+ Fix crash on redirect (related to the return
+ of the aspell menu in compose's toolbar)
+ * src/image_viewer.c
+ * src/prefs_msg_colors.c
+ * src/gtk/pluginwindow.c
+ * src/gtk/prefswindow.c
+ Change released signals to clicked (Fabien)
+ * po/POTFILES.in
+ * src/common/socket.c
+ * src/plugins/spamassassin/spamassassin.c
+ Translate strings (Fabien)
+
2006-04-25 [paul] 2.1.1cvs33
* src/folder.c
( cvs diff -u -r 1.382.2.267 -r 1.382.2.268 src/compose.c; ) > 2.1.1cvs31.patchset
( cvs diff -u -r 1.83.2.67 -r 1.83.2.68 src/mimeview.c; cvs diff -u -r 1.101.2.23 -r 1.101.2.24 src/news.c; cvs diff -u -r 1.395.2.193 -r 1.395.2.194 src/summaryview.c; cvs diff -u -r 1.68.2.22 -r 1.68.2.23 src/summaryview.h; ) > 2.1.1cvs32.patchset
( cvs diff -u -r 1.213.2.89 -r 1.213.2.90 src/folder.c; cvs diff -u -r 1.87.2.26 -r 1.87.2.27 src/folder.h; cvs diff -u -r 1.207.2.96 -r 1.207.2.97 src/folderview.c; ) > 2.1.1cvs33.patchset
+( cvs diff -u -r 1.53.2.16 -r 1.53.2.17 po/POTFILES.in; cvs diff -u -r 1.382.2.268 -r 1.382.2.269 src/compose.c; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/image_viewer.c; cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_msg_colors.c; cvs diff -u -r 1.13.2.20 -r 1.13.2.21 src/common/socket.c; cvs diff -u -r 1.9.2.39 -r 1.9.2.40 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.29 -r 1.5.2.30 src/gtk/pluginwindow.c; cvs diff -u -r 1.12.2.25 -r 1.12.2.26 src/gtk/prefswindow.c; cvs diff -u -r 1.18.2.33 -r 1.18.2.34 src/plugins/spamassassin/spamassassin.c; ) > 2.1.1cvs34.patchset
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=33
+EXTRA_VERSION=34
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
src/common/nntp.c
src/common/plugin.c
src/common/smtp.c
+src/common/socket.c
src/common/ssl.c
src/common/ssl_certificate.c
src/common/string_match.c
#endif
#include <glib.h>
+#include <glib/gi18n.h>
+
#include <sys/time.h>
#include <sys/types.h>
#ifdef G_OS_WIN32
n = write(fd, buf, len);
if (n <= 0) {
- log_error("write on fd%d: %s\n", fd, strerror(errno));
+ log_error(_("write on fd%d: %s\n"), fd, strerror(errno));
return -1;
}
len -= n;
GtkItemFactory *ifactory = gtk_item_factory_from_widget(compose->menubar);
GSList *spell_menu;
+ if (compose->gtkaspell == NULL)
+ return;
+
parent_item = gtk_item_factory_get_item(ifactory,
"/Spelling/Options");
{
GtkWidget *item, *submenu;
gchar *dictname;
- GtkAspeller *gtkaspeller = gtkaspell->gtkaspeller;
+ GtkAspeller *gtkaspeller = NULL;
GSList *list = NULL;
+ if (!gtkaspell)
+ return NULL;
+
+ gtkaspeller = gtkaspell->gtkaspeller;
dictname = g_strdup_printf(_("Dictionary: %s"),
gtkaspeller->dictionary->dictname);
item = gtk_menu_item_new_with_label(dictname);
gtk_widget_set_sensitive(GTK_WIDGET(unload_btn), FALSE);
- g_signal_connect(G_OBJECT(load_btn), "released",
+ g_signal_connect(G_OBJECT(load_btn), "clicked",
G_CALLBACK(load_cb), pluginwindow);
- g_signal_connect(G_OBJECT(unload_btn), "released",
+ g_signal_connect(G_OBJECT(unload_btn), "clicked",
G_CALLBACK(unload_cb), pluginwindow);
- g_signal_connect(G_OBJECT(close_btn), "released",
+ g_signal_connect(G_OBJECT(close_btn), "clicked",
G_CALLBACK(close_cb), pluginwindow);
g_signal_connect(G_OBJECT(window), "size_allocate",
G_CALLBACK(pluginwindow_size_allocate_cb), NULL);
}
}
-static void apply_button_released(GtkButton *button, gpointer user_data)
+static void apply_button_clicked(GtkButton *button, gpointer user_data)
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
g_free(prefswindow);
}
-static void ok_button_released(GtkButton *button, gpointer user_data)
+static void ok_button_clicked(GtkButton *button, gpointer user_data)
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
}
}
-static void cancel_button_released(GtkButton *button, gpointer user_data)
+static void cancel_button_clicked(GtkButton *button, gpointer user_data)
{
PrefsWindow *prefswindow = (PrefsWindow *) user_data;
if (event) {
switch (event->keyval) {
case GDK_Escape :
- cancel_button_released(NULL, data);
+ cancel_button_clicked(NULL, data);
break;
case GDK_Return :
case GDK_KP_Enter :
* and text (anything that accepts return) (can pass
* NULL to any of the GTK_xxx() casts) */
if (!GTK_IS_TEXT_VIEW(focused_child))
- ok_button_released(NULL, data);
+ ok_button_clicked(NULL, data);
break;
default:
break;
gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->confirm_area, 0, 2, 1, 2, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 2);
- g_signal_connect(G_OBJECT(prefswindow->ok_btn), "released",
- G_CALLBACK(ok_button_released), prefswindow);
- g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "released",
- G_CALLBACK(cancel_button_released), prefswindow);
- g_signal_connect(G_OBJECT(prefswindow->apply_btn), "released",
- G_CALLBACK(apply_button_released), prefswindow);
+ g_signal_connect(G_OBJECT(prefswindow->ok_btn), "clicked",
+ G_CALLBACK(ok_button_clicked), prefswindow);
+ g_signal_connect(G_OBJECT(prefswindow->cancel_btn), "clicked",
+ G_CALLBACK(cancel_button_clicked), prefswindow);
+ g_signal_connect(G_OBJECT(prefswindow->apply_btn), "clicked",
+ G_CALLBACK(apply_button_clicked), prefswindow);
g_signal_connect(G_OBJECT(prefswindow->window), "delete_event",
G_CALLBACK(window_closed), prefswindow);
g_signal_connect(G_OBJECT(prefswindow->window), "key_press_event",
gtk_widget_ref(notebook);
- g_signal_connect(G_OBJECT(load_button), "released",
+ g_signal_connect(G_OBJECT(load_button), "clicked",
G_CALLBACK(load_cb), imageviewer);
g_signal_connect(G_OBJECT(scrolledwin), "button-press-event",
G_CALLBACK(scrolledwin_button_cb), imageviewer);
}
if (transport_setup(&trans, flags) != EX_OK) {
- log_error("Spamassassin plugin couldn't connect to spamd.\n");
+ log_error(_("Spamassassin plugin couldn't connect to spamd.\n"));
debug_print("failed to setup transport\n");
return FALSE;
}
/* SPAMASSASSIN_DISABLED : keep test for compatibility purpose */
if (!config.enable || config.transport == SPAMASSASSIN_DISABLED) {
- log_error("Spamassassin plugin is disabled by its preferences.\n");
+ log_error(_("Spamassassin plugin is disabled by its preferences.\n"));
return FALSE;
}
debug_print("Filtering message %d\n", msginfo->msgnum);
}
if (!config.enable || config.transport == SPAMASSASSIN_DISABLED) {
- log_error("Spamassassin plugin is loaded but disabled by its preferences.\n");
+ log_error(_("Spamassassin plugin is loaded but disabled by its preferences.\n"));
}
else {
if (config.transport == SPAMASSASSIN_TRANSPORT_TCP)
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
color_buttons.btn_quote_level1_bg = gtk_button_new();
gtk_widget_set_size_request (color_buttons.btn_quote_level1_bg, 30, 20);
gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_quote_level1_bg,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, color_buttons.btn_quote_level1_bg);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, color_buttons.btn_quote_level1_bg);
tooltips = gtk_tooltips_new();
gtk_tooltips_set_tip(tooltips, color_buttons.btn_quote_level1_bg,
_("Pick color for 1st level text background"), NULL);
gtk_widget_show(label_quote_bgcolor1);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor1,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_bgcolor1);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, label_quote_bgcolor1);
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
color_buttons.btn_quote_level2_bg = gtk_button_new();
gtk_widget_set_size_request (color_buttons.btn_quote_level2_bg, 30, 20);
gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_quote_level2_bg,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, color_buttons.btn_quote_level2_bg);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, color_buttons.btn_quote_level2_bg);
tooltips = gtk_tooltips_new();
gtk_tooltips_set_tip(tooltips, color_buttons.btn_quote_level2_bg,
_("Pick color for 2nd level text background"), NULL);
gtk_widget_show(label_quote_bgcolor2);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor2,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_bgcolor2);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, label_quote_bgcolor2);
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, hbox);
gtk_box_pack_start (GTK_BOX (vbox_quotebg), hbox, FALSE, TRUE, 0);
color_buttons.btn_quote_level3_bg = gtk_button_new();
gtk_widget_set_size_request (color_buttons.btn_quote_level3_bg, 30, 20);
gtk_box_pack_start (GTK_BOX(hbox), color_buttons.btn_quote_level3_bg,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, color_buttons.btn_quote_level3_bg);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, color_buttons.btn_quote_level3_bg);
tooltips = gtk_tooltips_new();
gtk_tooltips_set_tip(tooltips, color_buttons.btn_quote_level3_bg,
_("Pick color for 3rd level text background"), NULL);
gtk_widget_show(label_quote_bgcolor3);
gtk_box_pack_start (GTK_BOX(hbox), label_quote_bgcolor3,
FALSE, FALSE, 0);
- SET_TOGGLE_SENSITIVITY(chkbtn_enable_colors, label_quote_bgcolor3);
+ SET_TOGGLE_SENSITIVITY(chkbtn_enable_bgcolors, label_quote_bgcolor3);
hbox = gtk_hbox_new(FALSE, 8);
gtk_widget_show (hbox);