sync with 0.8.8cvs5

[claws.git] / src / prefs_common.c

diff --git a/src/prefs_common.c b/src/prefs_common.c
index f246894e695cdf18f05707d3bd21496a5b7d8743..5bb3e391e5605fdfff6bbe6039b17535cd8de46a 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -36,7 +36,7 @@
 
 #include "intl.h"
 #include "main.h"
-#include "prefs.h"
+#include "prefs_gtk.h"
 #include "prefs_common.h"
 #include "prefs_display_header.h"
 #include "prefs_summary_column.h"
@@ -779,7 +779,7 @@ static PrefParam param[] = {
         &interface.entry_pixmap_theme, prefs_set_data_from_entry, prefs_set_entry},
        
        /* Other */
-       {"uri_open_command", "netscape -remote 'openURL(%s,raise)'",
+       {"uri_open_command", DEFAULT_BROWSER_CMD,
         &prefs_common.uri_cmd, P_STRING,
         &other.uri_entry, prefs_set_data_from_entry, prefs_set_entry},
        {"print_command", "lpr %s", &prefs_common.print_cmd, P_STRING,
@@ -813,6 +813,8 @@ static PrefParam param[] = {
 #endif
        {"work_offline", "FALSE", &prefs_common.work_offline, P_BOOL,
         NULL, NULL, NULL},
+       {"summary_quicksearch_type", "0", &prefs_common.summary_quicksearch_type, P_INT,
+        NULL, NULL, NULL},
 
        {"hide_score", "-9999", &prefs_common.kill_score, P_INT,
         NULL, NULL, NULL},
@@ -1364,7 +1366,7 @@ static void prefs_send_create(void)
 
        SET_MENUITEM(_("Automatic (Recommended)"),       CS_AUTO);
        SET_MENUITEM(_("7bit ascii (US-ASCII)"),         CS_US_ASCII);
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        SET_MENUITEM(_("Unicode (UTF-8)"),               CS_UTF_8);
 #endif
        SET_MENUITEM(_("Western European (ISO-8859-1)"),  CS_ISO_8859_1);
@@ -1374,11 +1376,11 @@ static void prefs_send_create(void)
        SET_MENUITEM(_("Baltic (ISO-8859-4)"),            CS_ISO_8859_4);
        SET_MENUITEM(_("Greek (ISO-8859-7)"),             CS_ISO_8859_7);
        SET_MENUITEM(_("Turkish (ISO-8859-9)"),           CS_ISO_8859_9);
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        SET_MENUITEM(_("Cyrillic (ISO-8859-5)"),          CS_ISO_8859_5);
 #endif
        SET_MENUITEM(_("Cyrillic (KOI8-R)"),             CS_KOI8_R);
-#if HAVE_LIBJCONV
+#if HAVE_ICONV
        SET_MENUITEM(_("Cyrillic (Windows-1251)"),       CS_WINDOWS_1251);
        SET_MENUITEM(_("Cyrillic (KOI8-U)"),             CS_KOI8_U);
 #endif
@@ -2268,7 +2270,7 @@ static void prefs_display_create(void)
 
        PACK_CHECK_BUTTON
                (vbox2, chkbtn_swapfrom,
-                _("Display recipient on `From' column if sender is yourself"));
+                _("Display recipient in `From' column if sender is yourself"));
        PACK_CHECK_BUTTON
                (vbox2, chkbtn_useaddrbook,
                 _("Display sender using address book"));
@@ -2888,11 +2890,13 @@ static void prefs_other_create(void)
        gtk_table_attach (GTK_TABLE (ext_table), uri_combo, 1, 2, 0, 1,
                          GTK_EXPAND | GTK_FILL, 0, 0, 0);
        gtkut_combo_set_items (GTK_COMBO (uri_combo),
+                              DEFAULT_BROWSER_CMD,
+                              "galeon --new-tab '%s'",
                               "galeon '%s'",
                               "mozilla -remote 'openurl(%s,new-window)'",
-                              "netscape -remote 'openURL(%s,raise)'",
+                              "netscape -remote 'openURL(%s, new-window)'",
                               "netscape '%s'",
-                              "gnome-moz-remote --raise --newwin '%s'",
+                              "gnome-moz-remote --newwin '%s'",
                               "kfmclient openURL '%s'",
                               "opera -newwindow '%s'",
                               "kterm -e w3m '%s'",