2006-12-01 [wwp] 2.6.0cvs77
[claws.git] / src / prefs_common.c
index 15b4368fa5eb215bee22ff54bfb1dc6d9c87d356..a82e11327ee8ccc3f1275951be10546ae88a8bbe 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,6 +95,8 @@ static PrefParam param_os_specific[] = {
          &prefs_common.widgetfont,             P_STRING, NULL, NULL, NULL},
        {"message_font_gtk2",   "Monospace 9",
         &prefs_common.textfont,                P_STRING, NULL, NULL, NULL},
+        {"print_font_gtk2",     "Monospace 9",
+         &prefs_common.printfont,              P_STRING, NULL, NULL, NULL},
        {"small_font_gtk2",     "Sans 9",
          &prefs_common.smallfont,              P_STRING, NULL, NULL, NULL},
        {"normal_font_gtk2",    "Sans 9",
@@ -107,12 +109,10 @@ static PrefParam param_os_specific[] = {
         &prefs_common.attach_load_dir, P_STRING, NULL, NULL, NULL},
 
        /* MIME viewer */
-       {"mime_image_viewer", NULL,
-        &prefs_common.mime_image_viewer, P_STRING, NULL, NULL, NULL},
-       {"mime_audio_player", NULL,
-        &prefs_common.mime_audio_player, P_STRING, NULL, NULL, NULL},
+       {"mime_textviewer", NULL,
+        &prefs_common.mime_textviewer,   P_STRING, NULL, NULL, NULL},
        {"mime_open_command", "notepad '%s'",
-        &prefs_common.mime_open_cmd, P_STRING, NULL, NULL, NULL},
+        &prefs_common.mime_open_cmd,     P_STRING, NULL, NULL, NULL},
 
        /* Interface */
        {"pixmap_theme_path", DEFAULT_PIXMAP_THEME, 
@@ -164,6 +164,10 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"receive_dialog_mode", "1", &prefs_common.recv_dialog_mode, P_ENUM,
         NULL, NULL, NULL},
+       {"receivewin_width", "460", &prefs_common.receivewin_width, P_INT,
+        NULL, NULL, NULL},
+       {"receivewin_height", "-1", &prefs_common.receivewin_height, P_INT,
+        NULL, NULL, NULL},
        {"no_receive_error_panel", "FALSE", &prefs_common.no_recv_err_panel,
         P_BOOL, NULL, NULL, NULL},
        {"close_receive_dialog", "TRUE", &prefs_common.close_recv_dialog,
@@ -176,6 +180,10 @@ static PrefParam param[] = {
         P_BOOL, NULL, NULL, NULL},
        {"send_dialog_mode", "0", &prefs_common.send_dialog_mode, P_ENUM,
         NULL, NULL, NULL},
+       {"sendwin_width", "460", &prefs_common.sendwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"sendwin_height", "-1", &prefs_common.sendwin_height, P_INT,
+        NULL, NULL, NULL},
 
        {"outgoing_charset", CS_AUTO, &prefs_common.outgoing_charset, P_STRING,
         NULL, NULL, NULL},
@@ -195,6 +203,12 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"undo_level", "50", &prefs_common.undolevels, P_INT,
         NULL, NULL, NULL},
+       {"compose_with_format", "FALSE", &prefs_common.compose_with_format, P_BOOL,
+        NULL, NULL, NULL},
+       {"compose_subject_format", "",
+        &prefs_common.compose_subject_format, P_STRING, NULL, NULL, NULL},
+       {"compose_body_format", N_("Hello,\\n"),
+        &prefs_common.compose_body_format, P_STRING, NULL, NULL, NULL},
 
        {"linewrap_length", "72", &prefs_common.linewrap_len, P_INT,
         NULL, NULL, NULL},
@@ -228,6 +242,8 @@ static PrefParam param[] = {
 #endif
        {"reply_with_quote", "TRUE", &prefs_common.reply_with_quote, P_BOOL,
         NULL, NULL, NULL},
+       {"compose_dnd_insert_or_attach", "0", &prefs_common.compose_dnd_mode, P_ENUM,
+        NULL, NULL, NULL},
 
        /* Account autoselection */
        {"reply_account_autoselect", "TRUE",
@@ -280,6 +296,8 @@ static PrefParam param[] = {
          &SPECIFIC_PREFS.widgetfont,           P_STRING, NULL, NULL, NULL},
        {"message_font_gtk2",   "Monospace 9",
         &SPECIFIC_PREFS.textfont,                      P_STRING, NULL, NULL, NULL},
+        {"print_font_gtk2",     "Monospace 9",
+         &SPECIFIC_PREFS.printfont,             P_STRING, NULL, NULL, NULL},
        {"small_font_gtk2",     "Sans 9",
          &SPECIFIC_PREFS.smallfont,            P_STRING, NULL, NULL, NULL},
        {"normal_font_gtk2",    "Sans 9",
@@ -288,31 +306,31 @@ static PrefParam param[] = {
        /* custom colors */
        {"custom_color1", "#ff9900", &prefs_common.custom_colorlabel[0].color, P_COLOR,
         NULL, NULL, NULL},
-       {"custom_colorlabel1", "Orange", &prefs_common.custom_colorlabel[0].label, P_STRING,
+       {"custom_colorlabel1", N_("Orange"), &prefs_common.custom_colorlabel[0].label, P_STRING,
         NULL, NULL, NULL},
        {"custom_color2", "#ff0000", &prefs_common.custom_colorlabel[1].color, P_COLOR,
         NULL, NULL, NULL},
-       {"custom_colorlabel2", "Red", &prefs_common.custom_colorlabel[1].label, P_STRING,
+       {"custom_colorlabel2", N_("Red"), &prefs_common.custom_colorlabel[1].label, P_STRING,
         NULL, NULL, NULL},
        {"custom_color3", "#ff66ff", &prefs_common.custom_colorlabel[2].color, P_COLOR,
         NULL, NULL, NULL},
-       {"custom_colorlabel3", "Pink", &prefs_common.custom_colorlabel[2].label, P_STRING,
+       {"custom_colorlabel3", N_("Pink"), &prefs_common.custom_colorlabel[2].label, P_STRING,
         NULL, NULL, NULL},
        {"custom_color4", "#00ccff", &prefs_common.custom_colorlabel[3].color, P_COLOR,
         NULL, NULL, NULL},
-       {"custom_colorlabel4", "Sky blue", &prefs_common.custom_colorlabel[3].label, P_STRING,
+       {"custom_colorlabel4", N_("Sky blue"), &prefs_common.custom_colorlabel[3].label, P_STRING,
         NULL, NULL, NULL},
        {"custom_color5", "#0000ff", &prefs_common.custom_colorlabel[4].color, P_COLOR,
         NULL, NULL, NULL},
-       {"custom_colorlabel5", "Blue", &prefs_common.custom_colorlabel[4].label, P_STRING,
+       {"custom_colorlabel5", N_("Blue"), &prefs_common.custom_colorlabel[4].label, P_STRING,
         NULL, NULL, NULL},
        {"custom_color6", "#009900", &prefs_common.custom_colorlabel[5].color, P_COLOR,
         NULL, NULL, NULL},
-       {"custom_colorlabel6", "Green", &prefs_common.custom_colorlabel[5].label, P_STRING,
+       {"custom_colorlabel6", N_("Green"), &prefs_common.custom_colorlabel[5].label, P_STRING,
         NULL, NULL, NULL},
        {"custom_color7", "#663366", &prefs_common.custom_colorlabel[6].color, P_COLOR,
         NULL, NULL, NULL},
-       {"custom_colorlabel7", "Brown", &prefs_common.custom_colorlabel[6].label, P_STRING,
+       {"custom_colorlabel7", N_("Brown"), &prefs_common.custom_colorlabel[6].label, P_STRING,
         NULL, NULL, NULL},
 
        /* image viewer */
@@ -522,6 +540,14 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"quote_level3_color", "179", &prefs_common.quote_level3_col, P_COLOR,
         NULL, NULL, NULL},
+       {"enable_bgcolor", "FALSE", &prefs_common.enable_bgcolor, P_BOOL,
+        NULL, NULL, NULL},
+       {"quote_level1_bgcolor", "13421772", &prefs_common.quote_level1_bgcol, P_COLOR,
+        NULL, NULL, NULL},
+       {"quote_level2_bgcolor", "13948116", &prefs_common.quote_level2_bgcol, P_COLOR,
+        NULL, NULL, NULL},
+       {"quote_level3_bgcolor", "14540253", &prefs_common.quote_level3_bgcol, P_COLOR,
+        NULL, NULL, NULL},
        {"uri_color", "32512", &prefs_common.uri_col, P_COLOR,
         NULL, NULL, NULL},
        {"target_folder_color", "14294218", &prefs_common.tgt_folder_col, P_COLOR,
@@ -543,6 +569,8 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"line_space", "2", &prefs_common.line_space, P_INT,
         NULL, NULL, NULL},
+       {"never_send_retrcpt", "FALSE", &prefs_common.never_send_retrcpt, P_BOOL,
+        NULL, NULL, NULL},
 
        {"enable_smooth_scroll", "FALSE",
         &prefs_common.enable_smooth_scroll, P_BOOL,
@@ -551,10 +579,15 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"scroll_half_page", "FALSE", &prefs_common.scroll_halfpage, P_BOOL,
         NULL, NULL, NULL},
+       {"respect_flowed_format", "FALSE", &prefs_common.respect_flowed_format, P_BOOL,
+        NULL, NULL, NULL},
 
        {"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL,
         NULL, NULL, NULL},
 
+       {"use_different_print_font", "FALSE", &prefs_common.use_different_print_font, P_BOOL,
+        NULL, NULL, NULL},
+
        {"attach_desc", "TRUE", &prefs_common.attach_desc, P_BOOL,
         NULL, NULL, NULL},
        {"attach_save_directory", NULL,
@@ -563,12 +596,10 @@ static PrefParam param[] = {
         &SPECIFIC_PREFS.attach_load_dir, P_STRING, NULL, NULL, NULL},
 
        /* MIME viewer */
-       {"mime_image_viewer", DEFAULT_IMAGE_VIEWER_CMD,
-        &SPECIFIC_PREFS.mime_image_viewer,     P_STRING, NULL, NULL, NULL},
-       {"mime_audio_player", DEFAULT_AUDIO_PLAYER_CMD,
-        &SPECIFIC_PREFS.mime_audio_player, P_STRING, NULL, NULL, NULL},
+       {"mime_textviewer",   NULL,
+        &SPECIFIC_PREFS.mime_textviewer,   P_STRING, NULL, NULL, NULL},
        {"mime_open_command", "gedit '%s'",
-        &SPECIFIC_PREFS.mime_open_cmd, P_STRING, NULL, NULL, NULL},
+        &SPECIFIC_PREFS.mime_open_cmd,     P_STRING, NULL, NULL, NULL},
 
        /* Interface */
        {"separate_folder", "FALSE", &prefs_common.sep_folder, P_BOOL,
@@ -601,6 +632,15 @@ static PrefParam param[] = {
        {"ask_mark_all_read", "TRUE", &prefs_common.ask_mark_all_read, P_BOOL,
         NULL, NULL, NULL},
 
+       {"ask_apply_per_account_filtering_rules", "TRUE", &prefs_common.ask_apply_per_account_filtering_rules, P_BOOL,
+        NULL, NULL, NULL},
+       {"apply_per_account_filtering_rules", "0", &prefs_common.apply_per_account_filtering_rules, P_ENUM,
+        NULL, NULL, NULL},
+
+       /* Addressbook */
+       {"addressbook_use_editaddress_dialog", "TRUE", &prefs_common.addressbook_use_editaddress_dialog,
+        P_BOOL, NULL, NULL, NULL},
+
        /* Other */
        {"uri_open_command", DEFAULT_BROWSER_CMD,
         &SPECIFIC_PREFS.uri_cmd, P_STRING, NULL, NULL, NULL},
@@ -608,7 +648,6 @@ static PrefParam param[] = {
         &SPECIFIC_PREFS.print_cmd, P_STRING, NULL, NULL, NULL},
        {"ext_editor_command", DEFAULT_EDITOR_CMD,
         &SPECIFIC_PREFS.ext_editor_cmd, P_STRING, NULL, NULL, NULL},
-
        {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
         P_BOOL, NULL, NULL, NULL},
        {"confirm_on_exit", "FALSE", &prefs_common.confirm_on_exit, P_BOOL,
@@ -636,6 +675,16 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"log_length", "500", &prefs_common.loglength, P_INT,
         NULL, NULL, NULL},
+       {"log_msg_color", "#00af00", &prefs_common.log_msg_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"log_warn_color", "#af0000", &prefs_common.log_warn_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"log_error_color", "#af0000", &prefs_common.log_error_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"log_in_color", "#000000", &prefs_common.log_in_color, P_COLOR,
+        NULL, NULL, NULL},
+       {"log_out_color", "#0000ef", &prefs_common.log_out_color, P_COLOR,
+        NULL, NULL, NULL},
 
        {"color_new", "179", &prefs_common.color_new, P_COLOR,
         NULL, NULL, NULL},
@@ -673,7 +722,12 @@ static PrefParam param[] = {
 
        {"addressbookeditpersonwin_width", "640", &prefs_common.addressbookeditpersonwin_width, P_INT,
         NULL, NULL, NULL},
-       {"addressbookeditpersonwin_height", "-1", &prefs_common.addressbookeditpersonwin_height, P_INT,
+       {"addressbookeditpersonwin_height", "320", &prefs_common.addressbookeditpersonwin_height, P_INT,
+        NULL, NULL, NULL},
+
+       {"addressbookeditgroupwin_width", "580", &prefs_common.addressbookeditgroupwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"addressbookeditgroupwin_height", "340", &prefs_common.addressbookeditgroupwin_height, P_INT,
         NULL, NULL, NULL},
 
        {"pluginswin_width", "480", &prefs_common.pluginswin_width, P_INT,
@@ -716,6 +770,11 @@ static PrefParam param[] = {
        {"addressaddwin_height", "-1", &prefs_common.addressaddwin_height, P_INT,
         NULL, NULL, NULL},
 
+       {"addressbook_folderselwin_width", "300", &prefs_common.addressbook_folderselwin_width, P_INT,
+        NULL, NULL, NULL},
+       {"addressbook_folderselwin_height", "-1", &prefs_common.addressbook_folderselwin_height, P_INT,
+        NULL, NULL, NULL},
+
        /* Hidden */
        {"warn_dnd", "1", &prefs_common.warn_dnd, P_INT,
         NULL, NULL, NULL},
@@ -724,7 +783,13 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"enable_swap_from", "FALSE", &prefs_common.swap_from, P_BOOL,
         NULL, NULL, NULL},
-       {"enable_rules_hint", "TRUE", &prefs_common.enable_rules_hint, P_BOOL,
+       {"use_stripes_everywhere", "TRUE", &prefs_common.use_stripes_everywhere, P_BOOL,
+        NULL, NULL, NULL},
+       {"use_stripes_in_summaries", "TRUE", &prefs_common.use_stripes_in_summaries, P_BOOL,
+        NULL, NULL, NULL},
+       {"stripes_color_offset", "4000", &prefs_common.stripes_color_offset, P_INT,
+        NULL, NULL, NULL},
+       {"enable_dotted_lines", "FALSE", &prefs_common.enable_dotted_lines, P_BOOL,
         NULL, NULL, NULL},
        {"enable_hscrollbar", "TRUE", &prefs_common.enable_hscrollbar, P_BOOL,
         NULL, NULL, NULL},
@@ -744,8 +809,18 @@ static PrefParam param[] = {
        P_INT, NULL, NULL, NULL },
        {"summary_quicksearch_sticky", "1", &prefs_common.summary_quicksearch_sticky, P_INT,
         NULL, NULL, NULL},
+       {"summary_quicksearch_dynamic", "0", &prefs_common.summary_quicksearch_dynamic, P_INT,
+        NULL, NULL, NULL},
        {"statusbar_update_step", "10", &prefs_common.statusbar_update_step, P_INT,
         NULL, NULL, NULL},
+       {"compose_no_markup", "FALSE", &prefs_common.compose_no_markup, P_BOOL,
+        NULL, NULL, NULL},
+       {"skip_ssl_cert_check", "FALSE", &prefs_common.skip_ssl_cert_check, P_BOOL,
+        NULL, NULL, NULL},
+       {"live_dangerously", "FALSE", &prefs_common.live_dangerously, P_BOOL,
+        NULL, NULL, NULL},
+       {"hide_quotes", "0", &prefs_common.hide_quotes, P_INT,
+        NULL, NULL, NULL},
 
        {NULL, NULL, NULL, P_OTHER, NULL, NULL, NULL}
 };
@@ -788,6 +863,7 @@ GList *prefs_common_read_history(const gchar *history)
 void prefs_common_read_config(void)
 {
        gchar *rcpath;
+       gchar *tmp;
 
        rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
        prefs_read_config(param, "Common", rcpath, NULL);
@@ -797,14 +873,34 @@ void prefs_common_read_config(void)
 
        g_free(rcpath);
 
-       prefs_common.quotefmt = gettext(prefs_common.quotefmt);
-       prefs_common.fw_quotefmt = gettext(prefs_common.fw_quotefmt);
-       prefs_common.date_format = gettext(prefs_common.date_format);
+       tmp = g_strdup(gettext(prefs_common.quotefmt));
+       g_free(prefs_common.quotefmt);
+       prefs_common.quotefmt = tmp;
+
+       tmp = g_strdup(gettext(prefs_common.fw_quotefmt));
+       g_free(prefs_common.fw_quotefmt);
+       prefs_common.fw_quotefmt = tmp;
+       
+       tmp = g_strdup(gettext(prefs_common.date_format));
+       g_free(prefs_common.date_format);
+       prefs_common.date_format = tmp;
 
        prefs_common.mime_open_cmd_history =
                prefs_common_read_history(COMMAND_HISTORY);
        prefs_common.summary_quicksearch_history =
                prefs_common_read_history(QUICKSEARCH_HISTORY);
+       prefs_common.summary_search_from_history =
+               prefs_common_read_history(SUMMARY_SEARCH_FROM_HISTORY);
+       prefs_common.summary_search_to_history =
+               prefs_common_read_history(SUMMARY_SEARCH_TO_HISTORY);
+       prefs_common.summary_search_subject_history =
+               prefs_common_read_history(SUMMARY_SEARCH_SUBJECT_HISTORY);
+       prefs_common.summary_search_body_history =
+               prefs_common_read_history(SUMMARY_SEARCH_BODY_HISTORY);
+       prefs_common.summary_search_adv_condition_history =
+               prefs_common_read_history(SUMMARY_SEARCH_ADV_CONDITION_HISTORY);
+       prefs_common.message_search_history =
+               prefs_common_read_history(MESSAGE_SEARCH_HISTORY);
 
        colorlabel_update_colortable_from_prefs();
 }
@@ -846,59 +942,162 @@ void prefs_common_write_config(void)
                prefs_common.mime_open_cmd_history);
        prefs_common_save_history(QUICKSEARCH_HISTORY, 
                prefs_common.summary_quicksearch_history);
+       prefs_common_save_history(SUMMARY_SEARCH_FROM_HISTORY, 
+               prefs_common.summary_search_from_history);
+       prefs_common_save_history(SUMMARY_SEARCH_TO_HISTORY, 
+               prefs_common.summary_search_to_history);
+       prefs_common_save_history(SUMMARY_SEARCH_SUBJECT_HISTORY, 
+               prefs_common.summary_search_subject_history);
+       prefs_common_save_history(SUMMARY_SEARCH_BODY_HISTORY, 
+               prefs_common.summary_search_body_history);
+       prefs_common_save_history(SUMMARY_SEARCH_ADV_CONDITION_HISTORY, 
+               prefs_common.summary_search_adv_condition_history);
+       prefs_common_save_history(MESSAGE_SEARCH_HISTORY, 
+               prefs_common.message_search_history);
+}
+
+/* make a copy of string 'in' into buffer 'out'. un-escape \ sequences.
+   both 'in' and 'out' must be non-NULL.
+   'out' must be a pointer to a buffer whose size is at least equal
+   to strlen(txt)+1, this buffer will get cleared. out's contents
+   will always get set to a valid string, even if it's "".*/
+void pref_get_unescaped_pref(gchar *out, const gchar *in)
+{
+       const gchar *i;
+       gchar *o;
+
+       *out = '\0';
+
+       g_return_if_fail( in != NULL );
+       g_return_if_fail( out != NULL );
+
+       i = in;
+       o = out;
+       memset(out, 0, strlen(in)+1);
+       while (*i != '\0') {
+               if (*i == '\\' && *(i+1) == 'n') {
+                       *o++ = '\n';
+                       i++;
+               } else if (*i == '\\' && *(i+1) == 't') {
+                       *o++ = '\t';
+                       i++;
+               } else if (*i == '\\' && *(i+1) == '\\') {
+                       *o++ = '\\';
+                       i++;
+               } else {
+                       *o++ = *i;
+               }
+               i++;
+       }
+       *o='\0';
 }
 
-void pref_set_textview_from_pref(GtkTextView *textview, gchar *txt)
+/* make a copy of string 'in' into buffer 'out'. escape \ sequences.
+   both 'in' and 'out' must be non-NULL.
+   'out' must be a pointer to a buffer whose size is at least equal
+   to 2*strlen(txt)+1. out's contents will always get set to a valid
+   string, even if it's "". */
+void pref_get_escaped_pref(gchar *out, const gchar *in)
 {
-       GtkTextBuffer *buffer = gtk_text_view_get_buffer(textview);
-       gchar *o_out, *out = malloc(txt?(strlen(txt)+1):1);
-       gchar *t = txt;
-       memset(out, 0, strlen(txt)+1);
-       o_out = out;
-       while (*t != '\0') {
-               if (*t == '\\' && *(t+1) == 'n') {
-                       *out++ = '\n';
-                       t++;
-               } else if (*t == '\\') {
-                       t++;
+       const gchar *i;
+       gchar *o;
+
+       *out = '\0';
+
+       g_return_if_fail( in != NULL );
+       g_return_if_fail( out != NULL );
+
+       i = in;
+       o = out;
+       while (*i != '\0') {
+               if (*i == '\n') {
+                       *o++ = '\\';
+                       *o++ = 'n';
+               } else if (*i == '\t') {
+                       *o++ = '\\';
+                       *o++ = 't';
+               } else if (*i == '\\') {
+                       *o++ = '\\';
+                       *o++ = '\\';
                } else {
-                       *out++ = *t;
+                       *o++ = *i;
                }
-               t++;
+               i++;
        }
-       *out='\0';
+       *o = '\0';
+}
+               
+/* set the contents of a textview widget from the internal \-escaped
+  representation of a pref string. both txt and textview must be non-NULL. */
+void pref_set_textview_from_pref(GtkTextView *textview, const gchar *txt)
+{
+       GtkTextBuffer *buffer;
+       gchar *out = NULL;
+
+       g_return_if_fail( txt != NULL );
+       g_return_if_fail( textview != NULL );
+
+       buffer = gtk_text_view_get_buffer(textview);
+       out = malloc(strlen(txt)+1);
+
+       pref_get_unescaped_pref(out, txt);
 
-       gtk_text_buffer_set_text(buffer, o_out?o_out:"", -1);
-       g_free(o_out);
+       gtk_text_buffer_set_text(buffer, out?out:"", -1);
+       g_free(out);
 }
 
+/* set the contents of a gtkentry widget from the internal \-escaped
+  representation of a pref string. both txt and entry must be non-NULL. */
+void pref_set_entry_from_pref(GtkEntry *entry, const gchar *txt)
+{
+       gchar *out = NULL;
+
+       g_return_if_fail( txt != NULL );
+       g_return_if_fail( entry != NULL );
+
+       out = malloc(strlen(txt)+1);
+
+       pref_get_unescaped_pref(out, txt);
+
+       gtk_entry_set_text(entry, out?out:"");
+       g_free(out);
+}
+
+/* get the \-escaped internal representation of a pref from the contents of
+   a textview widget. textview must be non-NULL. */
 gchar *pref_get_pref_from_textview(GtkTextView *textview) 
 {
        GtkTextBuffer *buffer;
        GtkTextIter start, end;
-       gchar *o_out, *out, *tmp, *t;
+       gchar *out, *tmp;
        
+       g_return_val_if_fail( textview != NULL, "" );
+
        buffer = gtk_text_view_get_buffer(textview);
        gtk_text_buffer_get_start_iter(buffer, &start);
        gtk_text_buffer_get_iter_at_offset(buffer, &end, -1);
        tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
-       t = tmp;
-       o_out = out = malloc(2*strlen(tmp)+1);
+       out = malloc(2*strlen(tmp)+1);
        
-       while (*t != '\0') {
-               if (*t == '\n') {
-                       *out++ = '\\';
-                       *out++ = 'n';
-               } else if (*t == '\\') {
-                       *out++ = '\\';
-                       *out++ = '\\';
-               } else {
-                       *out++ = *t;
-               }
-               t++;
-       }
-       *out = '\0';
+       pref_get_escaped_pref(out, tmp);
+       g_free(tmp);
+
+       return out?out:"";
+}
+
+/* get the \-escaped internal representation of a pref from the contents of
+   a gtkentry widget. entry must be non-NULL. */
+gchar *pref_get_pref_from_entry(GtkEntry *entry) 
+{
+       gchar *out, *tmp;
+
+       g_return_val_if_fail( entry != NULL, "" );
+
+       tmp = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+       out = malloc(2*strlen(tmp)+1);
+
+       pref_get_escaped_pref(out, tmp);
        g_free(tmp);
 
-       return o_out;
+       return out?out:"";
 }