commit - 7648f9fb6a272880b6247b1b4a56af550957d8ea
commit + c78e870bcc9dc9af08c50f21109e74cd02a7c76f
blob - adfcd26b87034443b83b0844479e66942ac82a18
blob + d1a49492700a6c3f082bb85f4481e2c7ae5c51d1
--- src/compose.c
+++ src/compose.c
#define ENC_ACTION(cs_char,c_char,string) \
{"Options/Encoding/" cs_char, NULL, N_(string), NULL, NULL, c_char }
- {"Options/Encoding/Western", NULL, N_("Western European"), NULL, NULL, NULL },
- {"Options/Encoding/Baltic", NULL, N_("Baltic"), NULL, NULL, NULL },
- {"Options/Encoding/Hebrew", NULL, N_("Hebrew"), NULL, NULL, NULL },
- {"Options/Encoding/Arabic", NULL, N_("Arabic"), NULL, NULL, NULL },
- {"Options/Encoding/Cyrillic", NULL, N_("Cyrillic"), NULL, NULL, NULL },
- {"Options/Encoding/Japanese", NULL, N_("Japanese"), NULL, NULL, NULL },
- {"Options/Encoding/Chinese", NULL, N_("Chinese"), NULL, NULL, NULL },
- {"Options/Encoding/Korean", NULL, N_("Korean"), NULL, NULL, NULL },
- {"Options/Encoding/Thai", NULL, N_("Thai"), NULL, NULL, NULL },
-
/* Tools menu */
{"Tools/AddressBook", NULL, N_("_Address book"), "<shift><control>A", NULL, G_CALLBACK(compose_address_cb) },
gtk_text_buffer_get_start_iter(buffer, &start);
chars = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
- out_codeset = conv_get_charset_str(compose->out_encoding);
+ out_codeset = CS_UTF_8;
- if (!out_codeset && is_ascii_str(chars)) {
- out_codeset = CS_US_ASCII;
- } else if (prefs_common.outgoing_fallback_to_ascii &&
- is_ascii_str(chars)) {
- out_codeset = CS_US_ASCII;
- encoding = ENC_7BIT;
- }
-
- if (!out_codeset) {
- gchar *test_conv_global_out = NULL;
- gchar *test_conv_reply = NULL;
-
- /* automatic mode. be automatic. */
- codeconv_set_strict(TRUE);
-
- out_codeset = conv_get_outgoing_charset_str();
- if (out_codeset) {
- debug_print("trying to convert to %s\n", out_codeset);
- test_conv_global_out = conv_codeset_strdup(chars, src_codeset, out_codeset);
- }
-
- if (!test_conv_global_out && compose->orig_charset
- && strcmp(compose->orig_charset, CS_US_ASCII)) {
- out_codeset = compose->orig_charset;
- debug_print("failure; trying to convert to %s\n", out_codeset);
- test_conv_reply = conv_codeset_strdup(chars, src_codeset, out_codeset);
- }
-
- if (!test_conv_global_out && !test_conv_reply) {
- /* we're lost */
- out_codeset = CS_INTERNAL;
- debug_print("failure; finally using %s\n", out_codeset);
- }
- g_free(test_conv_global_out);
- g_free(test_conv_reply);
- codeconv_set_strict(FALSE);
- }
-
if (encoding == ENC_UNKNOWN) {
if (prefs_common.encoding_method == CTE_BASE64)
encoding = ENC_BASE64;
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Separator1", "Options/Encoding/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_US_ASCII, "Options/Encoding/"CS_US_ASCII, GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_UTF_8, "Options/Encoding/"CS_UTF_8, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Separator2", "Options/Encoding/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Western", "Options/Encoding/Western", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Western", CS_ISO_8859_1, "Options/Encoding/Western/"CS_ISO_8859_1, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Western", CS_ISO_8859_15, "Options/Encoding/Western/"CS_ISO_8859_15, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Western", CS_WINDOWS_1252, "Options/Encoding/Western/"CS_WINDOWS_1252, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_ISO_8859_2, "Options/Encoding/"CS_ISO_8859_2, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Baltic", "Options/Encoding/Baltic", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Baltic", CS_ISO_8859_13, "Options/Encoding/Baltic/"CS_ISO_8859_13, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Baltic", CS_ISO_8859_4, "Options/Encoding/Baltic/"CS_ISO_8859_4, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_ISO_8859_7, "Options/Encoding/"CS_ISO_8859_7, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Hebrew", "Options/Encoding/Hebrew", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Hebrew", CS_ISO_8859_8, "Options/Encoding/Hebrew/"CS_ISO_8859_8, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Hebrew", CS_WINDOWS_1255, "Options/Encoding/Hebrew/"CS_WINDOWS_1255, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Arabic", "Options/Encoding/Arabic", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Arabic", CS_ISO_8859_6, "Options/Encoding/Arabic/"CS_ISO_8859_6, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Arabic", CS_WINDOWS_1256, "Options/Encoding/Arabic/"CS_WINDOWS_1256, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", CS_ISO_8859_9, "Options/Encoding/"CS_ISO_8859_9, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Cyrillic", "Options/Encoding/Cyrillic", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Cyrillic", CS_ISO_8859_5, "Options/Encoding/Cyrillic/"CS_ISO_8859_5, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Cyrillic", CS_KOI8_R, "Options/Encoding/Cyrillic/"CS_KOI8_R, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Cyrillic", CS_MACCYR, "Options/Encoding/Cyrillic/"CS_MACCYR, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Cyrillic", CS_KOI8_U, "Options/Encoding/Cyrillic/"CS_KOI8_U, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Cyrillic", CS_WINDOWS_1251, "Options/Encoding/Cyrillic/"CS_WINDOWS_1251, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Japanese", "Options/Encoding/Japanese", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Japanese", CS_ISO_2022_JP, "Options/Encoding/Japanese/"CS_ISO_2022_JP, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Japanese", CS_ISO_2022_JP_2, "Options/Encoding/Japanese/"CS_ISO_2022_JP_2, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Japanese", CS_EUC_JP, "Options/Encoding/Japanese/"CS_EUC_JP, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Japanese", CS_SHIFT_JIS, "Options/Encoding/Japanese/"CS_SHIFT_JIS, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Chinese", "Options/Encoding/Chinese", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Chinese", CS_GB18030, "Options/Encoding/Chinese/"CS_GB18030, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Chinese", CS_GB2312, "Options/Encoding/Chinese/"CS_GB2312, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Chinese", CS_GBK, "Options/Encoding/Chinese/"CS_GBK, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Chinese", CS_BIG5, "Options/Encoding/Chinese/"CS_BIG5, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Chinese", CS_EUC_TW, "Options/Encoding/Chinese/"CS_EUC_TW, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Korean", "Options/Encoding/Korean", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Korean", CS_EUC_KR, "Options/Encoding/Korean/"CS_EUC_KR, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Korean", CS_ISO_2022_KR, "Options/Encoding/Korean/"CS_ISO_2022_KR, GTK_UI_MANAGER_MENUITEM)
-
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding", "Thai", "Options/Encoding/Thai", GTK_UI_MANAGER_MENU)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Thai", CS_TIS_620, "Options/Encoding/Thai/"CS_TIS_620, GTK_UI_MANAGER_MENUITEM)
- MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Options/Encoding/Thai", CS_WINDOWS_874, "Options/Encoding/Thai/"CS_WINDOWS_874, GTK_UI_MANAGER_MENUITEM)
-/* phew. */
-
/* Tools menu */
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "AddressBook", "Tools/AddressBook", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(compose->ui_manager, "/Menu/Tools", "Template", "Tools/Template", GTK_UI_MANAGER_MENU)
blob - 838f338d8ae42c661b5142bf37064fac6932c22b
blob + 302f71eff1e9225344917b9fb3c36c082f943295
--- src/prefs_common.c
+++ src/prefs_common.c
{"sendwin_height", "-1", &prefs_common.sendwin_height, P_INT,
NULL, NULL, NULL},
- {"outgoing_charset", CS_AUTO, &prefs_common.outgoing_charset, P_STRING,
+ {"outgoing_charset", CS_UTF_8, &prefs_common.outgoing_charset, P_STRING,
NULL, NULL, NULL},
{"encoding_method", "0", &prefs_common.encoding_method, P_ENUM,
NULL, NULL, NULL},
blob - 4b30b4d9a3dcbdad45209325e16593825f59516e
blob + 50396344c9e554308c11cbe0ef73ce9a345c7f8e
--- src/prefs_send.c
+++ src/prefs_send.c
GtkWidget *checkbtn_warn_empty_subj;
GtkWidget *checkbtn_warn_multiple_recipients;
GtkWidget *spinbtn_warn_multiple_recipients;
- GtkWidget *combobox_charset;
GtkWidget *combobox_encoding_method;
} SendPage;
-static gchar * prefs_common_charset_set_data_from_optmenu(GtkWidget *widget)
-{
- GtkTreeModel *model;
- GtkTreeIter iter;
- gchar *data = NULL;
-
- cm_return_val_if_fail(widget != NULL, NULL);
-
- cm_return_val_if_fail(gtk_combo_box_get_active_iter(
- GTK_COMBO_BOX(widget), &iter), NULL);
-
- model = gtk_combo_box_get_model(GTK_COMBO_BOX(widget));
-
- gtk_tree_model_get(model, &iter, COMBOBOX_DATA, &data, -1);
-
- return data;
-}
-
typedef struct _combobox_sel_by_data_ctx {
GtkComboBox *combobox;
gchar *data;
} ComboboxSelCtx;
-static gboolean _select_by_data_func(GtkTreeModel *model, GtkTreePath *path,
- GtkTreeIter *iter, ComboboxSelCtx *ctx)
-{
- GtkComboBox *combobox = ctx->combobox;
- gchar *data = ctx->data;
- gchar *curdata;
-
- gtk_tree_model_get(GTK_TREE_MODEL(model), iter, COMBOBOX_DATA, &curdata, -1);
- if ( data != NULL && curdata != NULL && !strcmp(data, curdata) ) {
- gtk_combo_box_set_active_iter(combobox, iter);
- g_free(curdata);
- return TRUE;
- }
-
- g_free(curdata);
- return FALSE;
-}
-
-static void prefs_common_charset_set_optmenu(GtkWidget *widget, gchar *data)
-{
- GtkComboBox *combobox = GTK_COMBO_BOX(widget);
- GtkTreeModel *model;
- ComboboxSelCtx *ctx = NULL;
- cm_return_if_fail(combobox != NULL);
-
- model = gtk_combo_box_get_model(combobox);
-
- ctx = g_new(ComboboxSelCtx,
- sizeof(ComboboxSelCtx));
- ctx->combobox = combobox;
- ctx->data = data;
-
- gtk_tree_model_foreach(model, (GtkTreeModelForeachFunc)_select_by_data_func, ctx);
- g_free(ctx);
-}
-
-static gboolean _combobox_separator_func(GtkTreeModel *model,
- GtkTreeIter *iter, gpointer data)
-{
- gchar *txt = NULL;
-
- cm_return_val_if_fail(model != NULL, FALSE);
-
- gtk_tree_model_get(model, iter, COMBOBOX_TEXT, &txt, -1);
-
- if( txt == NULL )
- return TRUE;
-
- g_free(txt);
- return FALSE;
-}
-
static void checkbtn_warn_multiple_recipients_toggled(GtkToggleButton *button,
gpointer user_data)
{
GtkWidget *frame;
GtkWidget *vbox1, *vbox2, *hbox1;
GtkWidget *checkbtn_savemsg;
- GtkWidget *label_outcharset;
- GtkWidget *combobox_charset;
GtkListStore *optmenu;
GtkTreeIter iter;
- GtkCellRenderer *rend;
GtkWidget *combobox_encoding;
GtkWidget *label_encoding;
GtkWidget *checkbtn_senddialog;
gtk_container_set_border_width(GTK_CONTAINER(vbox2), 8);
gtk_container_add(GTK_CONTAINER(frame), vbox2);
- /* populate table within encoding sub-frame */
- label_outcharset = gtk_label_new (_("Outgoing encoding"));
- gtk_widget_show (label_outcharset);
- gtk_label_set_justify(GTK_LABEL(label_outcharset), GTK_JUSTIFY_RIGHT);
- gtk_label_set_xalign(GTK_LABEL(label_outcharset), 1.0);
- gtk_grid_attach(GTK_GRID(table), label_outcharset, 0, 1, 1, 1);
-
- optmenu = gtk_list_store_new(2,
- G_TYPE_STRING, /* Menu label */
- G_TYPE_STRING); /* Actual charset data string */
-
- combobox_charset = gtk_combo_box_new_with_model(
- GTK_TREE_MODEL(optmenu));
- rend = gtk_cell_renderer_text_new();
- gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox_charset), rend, TRUE);
- gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combobox_charset), rend,
- "text", COMBOBOX_TEXT,
- NULL);
-
- gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(combobox_charset),
- (GtkTreeViewRowSeparatorFunc)_combobox_separator_func, NULL, NULL);
-
- gtk_widget_show (combobox_charset);
- CLAWS_SET_TIP(combobox_charset,
- _("If 'Automatic' is selected, the optimal encoding"
- " for the current locale will be used"));
- gtk_grid_attach(GTK_GRID(table), combobox_charset, 1, 1, 1, 1);
-
-#define SET_MENUITEM(str, data) \
-{ \
- gtk_list_store_append(optmenu, &iter); \
- gtk_list_store_set(optmenu, &iter, \
- COMBOBOX_TEXT, str, \
- COMBOBOX_DATA, data, \
- -1); \
-}
-
- SET_MENUITEM(_("Automatic"), CS_AUTO);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("7bit ASCII (US-ASCII)"), CS_US_ASCII);
- SET_MENUITEM(_("Unicode (UTF-8)"), CS_UTF_8);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Western European (ISO-8859-1)"), CS_ISO_8859_1);
- SET_MENUITEM(_("Western European (ISO-8859-15)"), CS_ISO_8859_15);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Central European (ISO-8859-2)"), CS_ISO_8859_2);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Baltic (ISO-8859-13)"), CS_ISO_8859_13);
- SET_MENUITEM(_("Baltic (ISO-8859-4)"), CS_ISO_8859_4);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Greek (ISO-8859-7)"), CS_ISO_8859_7);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Hebrew (ISO-8859-8)"), CS_ISO_8859_8);
- SET_MENUITEM(_("Hebrew (Windows-1255)"), CS_WINDOWS_1255);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Arabic (ISO-8859-6)"), CS_ISO_8859_6);
- SET_MENUITEM(_("Arabic (Windows-1256)"), CS_WINDOWS_1256);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Turkish (ISO-8859-9)"), CS_ISO_8859_9);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Cyrillic (ISO-8859-5)"), CS_ISO_8859_5);
- SET_MENUITEM(_("Cyrillic (KOI8-R)"), CS_KOI8_R);
- SET_MENUITEM(_("Cyrillic (X-MAC-CYRILLIC)"), CS_MACCYR);
- SET_MENUITEM(_("Cyrillic (KOI8-U)"), CS_KOI8_U);
- SET_MENUITEM(_("Cyrillic (Windows-1251)"), CS_WINDOWS_1251);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Japanese (ISO-2022-JP)"), CS_ISO_2022_JP);
-#if 0
- SET_MENUITEM(_("Japanese (EUC-JP)"), CS_EUC_JP);
- SET_MENUITEM(_("Japanese (Shift_JIS)"), CS_SHIFT_JIS);
-#endif /* 0 */
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Simplified Chinese (GB18030)"), CS_GB18030);
- SET_MENUITEM(_("Simplified Chinese (GB2312)"), CS_GB2312);
- SET_MENUITEM(_("Simplified Chinese (GBK)"), CS_GBK);
- SET_MENUITEM(_("Traditional Chinese (Big5)"), CS_BIG5);
-#if 0
- SET_MENUITEM(_("Traditional Chinese (EUC-TW)"), CS_EUC_TW);
- SET_MENUITEM(_("Chinese (ISO-2022-CN)"), CS_ISO_2022_CN);
-#endif /* 0 */
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Korean (EUC-KR)"), CS_EUC_KR);
- SET_MENUITEM(NULL, NULL);
- SET_MENUITEM(_("Thai (TIS-620)"), CS_TIS_620);
- SET_MENUITEM(_("Thai (Windows-874)"), CS_WINDOWS_874);
-
-#undef SET_MENUITEM
-
label_encoding = gtk_label_new (_("Transfer encoding"));
gtk_widget_show (label_encoding);
gtk_label_set_justify(GTK_LABEL(label_encoding), GTK_JUSTIFY_RIGHT);
else
gtk_widget_set_sensitive(spinbtn_warn_multiple_recipients, FALSE);
- prefs_common_charset_set_optmenu(combobox_charset,
- prefs_common.outgoing_charset);
combobox_select_by_data(GTK_COMBO_BOX(combobox_encoding),
prefs_common.encoding_method);
prefs_send->checkbtn_warn_empty_subj = checkbtn_warn_empty_subj;
prefs_send->checkbtn_warn_multiple_recipients = checkbtn_warn_multiple_recipients;
prefs_send->spinbtn_warn_multiple_recipients = spinbtn_warn_multiple_recipients;
- prefs_send->combobox_charset = combobox_charset;
prefs_send->combobox_encoding_method = combobox_encoding;
prefs_send->page.widget = vbox1;
else
prefs_common.warn_sending_many_recipients_num = 0;
- g_free(prefs_common.outgoing_charset);
- prefs_common.outgoing_charset = prefs_common_charset_set_data_from_optmenu(
- page->combobox_charset);
- prefs_common.encoding_method =
- combobox_get_active_data(GTK_COMBO_BOX(page->combobox_encoding_method));
+ prefs_common.encoding_method = combobox_get_active_data(GTK_COMBO_BOX(page->combobox_encoding_method));
}
static void prefs_send_destroy_widget(PrefsPage *_page)
