2007-12-06 [colin] 3.1.0cvs62

[claws.git] / src / plugins / bogofilter / bogofilter_gtk.c

diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c
index 12493d28845fa63c7ba6aab1200660dbce83d417..a52c52be2e826719905fe99ac30b57efc9bb0ae6 100644 (file)
--- a/src/plugins/bogofilter/bogofilter_gtk.c
+++ b/src/plugins/bogofilter/bogofilter_gtk.c
@@ -41,6 +41,7 @@
 #include "bogofilter.h"
 #include "menu.h"
 #include "addressbook.h"
+#include "combobox.h"
 
 struct BogofilterPage
 {
@@ -61,13 +62,6 @@ struct BogofilterPage
        GtkWidget *mark_as_read;
 };
 
-/*!
- *\brief       Preset addressbook book/folder items
- */
-static const gchar *whitelist_ab_folder_text [] = {
-       N_("Any")
-};
-
 static void foldersel_cb(GtkWidget *widget, gpointer data)
 {
        GtkWidget *entry = (GtkWidget *) data;
@@ -86,13 +80,15 @@ static void foldersel_cb(GtkWidget *widget, gpointer data)
 static void bogofilter_whitelist_ab_select_cb(GtkWidget *widget, gpointer data)
 {
        struct BogofilterPage *page = (struct BogofilterPage *) data;
-       gchar *folderpath = NULL;
-       gboolean ret = FALSE;
-
-       folderpath = (gchar *) gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(page->whitelist_ab_folder_combo)->entry));
-       ret = addressbook_folder_selection(&folderpath);
-       if ( ret != FALSE && folderpath != NULL)
-               gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(page->whitelist_ab_folder_combo)->entry), folderpath);
+       const gchar *folderpath = NULL;
+       gchar *new_path = NULL;
+
+       folderpath = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(page->whitelist_ab_folder_combo)->child));
+       new_path = addressbook_folder_selection(folderpath);
+       if (new_path) {
+               gtk_entry_set_text(GTK_ENTRY(GTK_BIN(page->whitelist_ab_folder_combo)->child), new_path);
+               g_free(new_path);
+       } 
 }
 
 static void bogofilter_create_widget_func(PrefsPage * _page,
@@ -134,8 +130,6 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
 
        GtkWidget *whitelist_ab_folder_combo;
        GtkWidget *whitelist_ab_select_btn;
-       GList *combo_items;
-       gint i;
 
        tooltips = gtk_tooltips_new();
 
@@ -172,7 +166,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
                        _("Messages larger than this will not be checked"), NULL);
        gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(max_size_spinbtn), TRUE);
 
-       max_size_kb_label = gtk_label_new(_("kB"));
+       max_size_kb_label = gtk_label_new(_("KB"));
        gtk_widget_show(max_size_kb_label);
        gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_kb_label, FALSE, FALSE, 0);
 
@@ -210,7 +204,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
        gtk_widget_show (save_unsure_folder_entry);
        gtk_box_pack_start (GTK_BOX (hbox_save_unsure), save_unsure_folder_entry, TRUE, TRUE, 0);
        gtk_tooltips_set_tip(tooltips, save_unsure_folder_entry,
-                       _("Folder for storing mail for which spam status is Unsure. Leave empty to use the inbox folder."),
+                       _("Folder for storing mail for which spam status is Unsure. Leave empty to use the Inbox folder."),
                        NULL);
 
        save_unsure_folder_select = gtkut_get_browse_directory_btn(_("_Browse"));
@@ -237,20 +231,8 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
        gtk_tooltips_set_tip(tooltips, whitelist_ab_checkbtn,
                        _("Messages coming from your address book contacts will be received in the normal folder even if detected as spam"), NULL);
 
-       whitelist_ab_folder_combo = gtk_combo_new();
-       gtk_widget_show(whitelist_ab_folder_combo);
+       whitelist_ab_folder_combo = combobox_text_new(TRUE, _("Any"), NULL);
        gtk_widget_set_size_request(whitelist_ab_folder_combo, 100, -1);
-       gtk_entry_set_editable(GTK_ENTRY(GTK_COMBO(whitelist_ab_folder_combo)->entry),
-                              TRUE);
-
-       combo_items = NULL;
-       for (i = 0; i < (gint) (sizeof(whitelist_ab_folder_text) / sizeof(gchar *)); i++) {
-               combo_items = g_list_append(combo_items,
-                                           (gpointer) _(whitelist_ab_folder_text[i]));
-       }
-       gtk_combo_set_popdown_strings(GTK_COMBO(whitelist_ab_folder_combo), combo_items);
-       g_list_free(combo_items);
-
        gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_folder_combo, TRUE, TRUE, 0);
 
        whitelist_ab_select_btn = gtk_button_new_with_label(_("Select ..."));
@@ -307,7 +289,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(insert_header_checkbtn), config->insert_header);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(whitelist_ab_checkbtn), config->whitelist_ab);
        if (config->whitelist_ab_folder != NULL)
-               gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(whitelist_ab_folder_combo)->entry),
+               gtk_entry_set_text(GTK_ENTRY(GTK_BIN(whitelist_ab_folder_combo)->child),
                                config->whitelist_ab_folder);
        if (config->save_folder != NULL)
                gtk_entry_set_text(GTK_ENTRY(save_spam_folder_entry), config->save_folder);
@@ -376,7 +358,7 @@ static void bogofilter_save_func(PrefsPage *_page)
        config->whitelist_ab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->whitelist_ab));
        g_free(config->whitelist_ab_folder);
        config->whitelist_ab_folder = gtk_editable_get_chars(
-                               GTK_EDITABLE(GTK_COMBO(page->whitelist_ab_folder_combo)->entry), 0, -1);
+                               GTK_EDITABLE(GTK_BIN(page->whitelist_ab_folder_combo)->child), 0, -1);
 
        /* bogopath */
        g_free(config->bogopath);