2008-09-12 [colin] 3.5.0cvs103
[claws.git] / src / prefs_template.c
index 59eb194c44f031efd3f7e57df4f360b5865508d0..dc2ff11ff28f79cedd214a676e6058522cd75559 100644 (file)
@@ -57,6 +57,7 @@ static struct Templates {
        GtkWidget *list_view;
        GtkWidget *entry_name;
        GtkWidget *entry_subject;
+       GtkWidget *entry_from;
        GtkWidget *entry_to;
        GtkWidget *entry_cc;    
        GtkWidget *entry_bcc;
@@ -65,6 +66,26 @@ static struct Templates {
 
 static int modified = FALSE;
 static int modified_list = FALSE;
+
+static struct
+{
+       gchar *label;
+       GtkWidget **entry;
+       gboolean compl;
+       gchar *tooltips;
+} widgets_table[] = {
+       {N_("Name"),    &templates.entry_name,          FALSE,
+               N_("This name is used as the Menu item")},
+       {N_("From"),    &templates.entry_from,          TRUE,
+               N_("Override composing account's From header. This doesn't change the composing account.")},
+       {N_("To"),      &templates.entry_to,            TRUE,   NULL},
+       {N_("Cc"),      &templates.entry_cc,            TRUE,   NULL},
+       {N_("Bcc"),     &templates.entry_bcc,           TRUE,   NULL},
+       {N_("Subject"), &templates.entry_subject,       FALSE,  NULL},
+       {NULL,          NULL,                           FALSE,  NULL}
+};
+
+
 /* widget creating functions */
 static void prefs_template_window_create       (void);
 static void prefs_template_window_setup                (void);
@@ -78,18 +99,22 @@ static gint prefs_template_deleted_cb               (GtkWidget      *widget,
 static gboolean prefs_template_key_pressed_cb  (GtkWidget      *widget,
                                                 GdkEventKey    *event,
                                                 gpointer        data);
-static void prefs_template_cancel_cb           (void);
-static void prefs_template_ok_cb               (void);
-static void prefs_template_register_cb         (void);
-static void prefs_template_substitute_cb       (void);
-static void prefs_template_delete_cb           (void);
-static void prefs_template_delete_all_cb       (void);
-static void prefs_template_clear_cb            (void);
-static void prefs_template_duplicate_cb        (void);
-static void prefs_template_top_cb              (void);
-static void prefs_template_up_cb               (void);
-static void prefs_template_down_cb     (void);
-static void prefs_template_bottom_cb   (void);
+static gboolean prefs_template_search_func_cb (GtkTreeModel *model, gint column, 
+                                               const gchar *key, GtkTreeIter *iter, 
+                                               gpointer search_data);
+
+static void prefs_template_cancel_cb           (gpointer action, gpointer data);
+static void prefs_template_ok_cb               (gpointer action, gpointer data);
+static void prefs_template_register_cb         (gpointer action, gpointer data);
+static void prefs_template_substitute_cb       (gpointer action, gpointer data);
+static void prefs_template_delete_cb           (gpointer action, gpointer data);
+static void prefs_template_delete_all_cb       (gpointer action, gpointer data);
+static void prefs_template_clear_cb            (gpointer action, gpointer data);
+static void prefs_template_duplicate_cb                (gpointer action, gpointer data);
+static void prefs_template_top_cb              (gpointer action, gpointer data);
+static void prefs_template_up_cb               (gpointer action, gpointer data);
+static void prefs_template_down_cb             (gpointer action, gpointer data);
+static void prefs_template_bottom_cb           (gpointer action, gpointer data);
 
 static GtkListStore* prefs_template_create_data_store  (void);
 static void prefs_template_list_view_insert_template   (GtkWidget *list_view,
@@ -132,7 +157,7 @@ static void prefs_template_window_create(void)
        GtkWidget *scrolled_window;
        GtkWidget   *vpaned;
        GtkWidget     *vbox1;
-       GtkWidget       *table; /* including : entry_[name|to|cc|bcc|subject] */
+       GtkWidget       *table; /* including : entry_[name|from|to|cc|bcc|subject] */
        GtkWidget       *scroll2;
        GtkWidget         *text_value;
        GtkWidget     *vbox2;
@@ -159,7 +184,7 @@ static void prefs_template_window_create(void)
        GtkWidget         *ok_btn;
        static GdkGeometry geometry;
        gint i;
-       GtkTooltips *tooltips;
+       CLAWS_TIP_DECL();
 
        debug_print("Creating templates configuration window...\n");
 
@@ -198,45 +223,25 @@ static void prefs_template_window_create(void)
        gtk_widget_show(table);
        gtk_box_pack_start (GTK_BOX (vbox1), table, FALSE, FALSE, 0);
 
-       tooltips = gtk_tooltips_new();
-
-       struct
-       {
-               gchar *label;
-               GtkWidget **entry;
-               gboolean compl;
-               gchar *tooltips;
-       } tab[] = {
-               {_("Name"),     &templates.entry_name,          FALSE,
-                       _("This name is used as the Menu item")},
-               {_("To"),       &templates.entry_to,            TRUE,   NULL},
-               {_("Cc"),       &templates.entry_cc,            TRUE,   NULL},
-               {_("Bcc"),      &templates.entry_bcc,           TRUE,   NULL},
-               {_("Subject"),  &templates.entry_subject,       FALSE,  NULL},
-               {NULL,          NULL,                           FALSE,  NULL}
-       };
-
-       for (i=0; tab[i].label; i++) {
+
+       for (i=0; widgets_table[i].label; i++) {
 
                GtkWidget *label;
 
-               label = gtk_label_new(tab[i].label);
+               label = gtk_label_new(widgets_table[i].label);
                gtk_widget_show(label);
                gtk_table_attach(GTK_TABLE(table), label, 0, 1, i, (i + 1),
                                (GtkAttachOptions) (GTK_FILL),
                                (GtkAttachOptions) 0, 0, 0);
                gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);
 
-               *(tab[i].entry) = gtk_entry_new();
-               gtk_widget_show(*(tab[i].entry));
-               gtk_table_attach(GTK_TABLE(table), *(tab[i].entry), 1, 2, i, (i + 1),
+               *(widgets_table[i].entry) = gtk_entry_new();
+               gtk_widget_show(*(widgets_table[i].entry));
+               gtk_table_attach(GTK_TABLE(table), *(widgets_table[i].entry), 1, 2, i, (i + 1),
                                (GtkAttachOptions) (GTK_EXPAND|GTK_SHRINK|GTK_FILL),
                                (GtkAttachOptions) 0, 0, 0);
-               gtk_tooltips_set_tip(tooltips, *(tab[i].entry), tab[i].tooltips, NULL);
-
-               if (tab[i].compl)
-                       address_completion_register_entry(
-                               GTK_ENTRY(*(tab[i].entry)), TRUE);
+               CLAWS_SET_TIP(*(widgets_table[i].entry),
+                               widgets_table[i].tooltips);
        }
 
        /* template content */
@@ -261,7 +266,7 @@ static void prefs_template_window_create(void)
                }
        }
        gtk_widget_show(text_value);
-#ifndef MAEMO
+#ifndef GENERIC_UMPC
        gtk_widget_set_size_request(text_value, -1, 120);
 #else
        gtk_widget_set_size_request(text_value, -1, 60);
@@ -295,8 +300,8 @@ static void prefs_template_window_create(void)
        gtk_box_pack_start(GTK_BOX(hbox3), reg_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT (reg_btn), "clicked",
                         G_CALLBACK (prefs_template_register_cb), NULL);
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), reg_btn,
-                       _("Append the new template above to the list"), NULL);
+       CLAWS_SET_TIP(reg_btn,
+                       _("Append the new template above to the list"));
 
        subst_btn = gtkut_get_replace_btn(_("Replace"));
        gtk_widget_show(subst_btn);
@@ -304,24 +309,24 @@ static void prefs_template_window_create(void)
        g_signal_connect(G_OBJECT(subst_btn), "clicked",
                         G_CALLBACK(prefs_template_substitute_cb),
                         NULL);
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), subst_btn,
-                       _("Replace the selected template in list with the template above"), NULL);
+       CLAWS_SET_TIP(subst_btn,
+                       _("Replace the selected template in list with the template above"));
 
        del_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
        gtk_widget_show(del_btn);
        gtk_box_pack_start(GTK_BOX(hbox3), del_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT(del_btn), "clicked",
                         G_CALLBACK(prefs_template_delete_cb), NULL);
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), del_btn,
-                       _("Delete the selected template from the list"), NULL);
+       CLAWS_SET_TIP(del_btn,
+                       _("Delete the selected template from the list"));
 
        clear_btn = gtk_button_new_from_stock (GTK_STOCK_CLEAR);
        gtk_widget_show (clear_btn);
        gtk_box_pack_start (GTK_BOX (hbox3), clear_btn, FALSE, TRUE, 0);
        g_signal_connect(G_OBJECT (clear_btn), "clicked",
                        G_CALLBACK(prefs_template_clear_cb), NULL);
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), clear_btn,
-                       _("Clear all the input fields in the dialog"), NULL);
+       CLAWS_SET_TIP(clear_btn,
+                       _("Clear all the input fields in the dialog"));
 
 #if GTK_CHECK_VERSION(2, 8, 0)
        desc_btn = gtk_button_new_from_stock(GTK_STOCK_INFO);
@@ -332,8 +337,8 @@ static void prefs_template_window_create(void)
        gtk_box_pack_end(GTK_BOX(hbox2), desc_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(desc_btn), "clicked",
                         G_CALLBACK(quote_fmt_quote_description), window);
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), desc_btn,
-                       _("Show information on configuring templates"), NULL);
+       CLAWS_SET_TIP(desc_btn,
+                       _("Show information on configuring templates"));
 
        /* templates list */
        hbox4 = gtk_hbox_new(FALSE, 8);
@@ -356,8 +361,8 @@ static void prefs_template_window_create(void)
        gtk_box_pack_start(GTK_BOX(vbox3), top_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(top_btn), "clicked",
                         G_CALLBACK(prefs_template_top_cb), NULL);
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), top_btn,
-                       _("Move the selected template to the top"), NULL);
+       CLAWS_SET_TIP(top_btn,
+                       _("Move the selected template to the top"));
 
        PACK_VSPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
 
@@ -366,16 +371,16 @@ static void prefs_template_window_create(void)
        gtk_box_pack_start (GTK_BOX(vbox3), up_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(up_btn), "clicked",
                         G_CALLBACK(prefs_template_up_cb), NULL);
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), up_btn,
-                       _("Move the selected template up"), NULL);
+       CLAWS_SET_TIP(up_btn,
+                       _("Move the selected template up"));
 
        down_btn = gtk_button_new_from_stock(GTK_STOCK_GO_DOWN);
        gtk_widget_show (down_btn);
        gtk_box_pack_start(GTK_BOX (vbox3), down_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT (down_btn), "clicked",
                         G_CALLBACK(prefs_template_down_cb), NULL);
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), down_btn,
-                       _("Move the selected template down"), NULL);
+       CLAWS_SET_TIP(down_btn,
+                       _("Move the selected template down"));
 
        PACK_VSPACER(vbox3, spc_vbox, VSPACING_NARROW_2);
 
@@ -384,8 +389,8 @@ static void prefs_template_window_create(void)
        gtk_box_pack_start(GTK_BOX(vbox3), bottom_btn, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(bottom_btn), "clicked",
                         G_CALLBACK(prefs_template_bottom_cb), NULL);
-       gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), bottom_btn,
-                       _("Move the selected template to the bottom"), NULL);
+       CLAWS_SET_TIP(bottom_btn,
+                       _("Move the selected template to the bottom"));
 
        list_view = prefs_template_list_view_create();
        gtk_widget_show(list_view);
@@ -418,8 +423,6 @@ static void prefs_template_window_create(void)
                         G_CALLBACK(manual_open_with_anchor_cb),
                         MANUAL_ANCHOR_TEMPLATES);
 
-       address_completion_start(window);
-
        if (!geometry.min_height) {
                geometry.min_width = 500;
                geometry.min_height = 540;
@@ -441,6 +444,7 @@ static void prefs_template_reset_dialog(void)
        GtkTextBuffer *buffer;
 
        gtk_entry_set_text(GTK_ENTRY(templates.entry_name), "");
+       gtk_entry_set_text(GTK_ENTRY(templates.entry_from), "");
        gtk_entry_set_text(GTK_ENTRY(templates.entry_to), "");
        gtk_entry_set_text(GTK_ENTRY(templates.entry_cc), "");
        gtk_entry_set_text(GTK_ENTRY(templates.entry_bcc), "");                 
@@ -468,6 +472,7 @@ static void prefs_template_window_setup(void)
        GSList *tmpl_list;
        GSList *cur;
        Template *tmpl;
+       int i;
 
        manage_window_set_transient(GTK_WINDOW(templates.window));
        gtk_widget_grab_focus(templates.ok_btn);
@@ -476,6 +481,14 @@ static void prefs_template_window_setup(void)
        
        tmpl_list = template_read_config();
 
+       address_completion_start(templates.window);
+
+       for (i=0; widgets_table[i].label; i++) {
+               if (widgets_table[i].compl)
+                       address_completion_register_entry(
+                               GTK_ENTRY(*(widgets_table[i].entry)), TRUE);
+       }
+
        for (cur = tmpl_list; cur != NULL; cur = cur->next) {
                tmpl = (Template *)cur->data;
                prefs_template_list_view_insert_template(templates.list_view,
@@ -491,7 +504,7 @@ static void prefs_template_window_setup(void)
 static gint prefs_template_deleted_cb(GtkWidget *widget, GdkEventAny *event,
                                      gpointer data)
 {
-       prefs_template_cancel_cb();
+       prefs_template_cancel_cb(NULL, NULL);
        return TRUE;
 }
 
@@ -499,7 +512,7 @@ static gboolean prefs_template_key_pressed_cb(GtkWidget *widget,
                                              GdkEventKey *event, gpointer data)
 {
        if (event && event->keyval == GDK_Escape)
-               prefs_template_cancel_cb();
+               prefs_template_cancel_cb(NULL, NULL);
        else {
                GtkWidget *focused = gtkut_get_focused_child(
                                        GTK_CONTAINER(widget));
@@ -510,7 +523,42 @@ static gboolean prefs_template_key_pressed_cb(GtkWidget *widget,
        return FALSE;
 }
 
-static void prefs_template_ok_cb(void)
+static gboolean prefs_template_search_func_cb (GtkTreeModel *model, gint column, const gchar *key, 
+                                               GtkTreeIter *iter, gpointer search_data) 
+{
+       gchar *store_string;
+       gint key_len;
+       gboolean retval;
+       GtkTreePath *path;
+
+       gtk_tree_model_get (model, iter, column, &store_string, -1);
+
+       if (!store_string || !key) return FALSE;
+
+       key_len = strlen (key);
+       retval = (strncmp (key, store_string, key_len) != 0);
+
+       g_free(store_string);
+       debug_print("selecting row\n");
+       path = gtk_tree_model_get_path(model, iter);
+       prefs_template_select_row(GTK_TREE_VIEW(templates.list_view), path);
+       gtk_tree_path_free(path);
+
+       return retval;
+}
+static void prefs_template_address_completion_end(void)
+{
+       gint i;
+
+       for (i=0; widgets_table[i].label; i++) {
+               if (widgets_table[i].compl)
+                       address_completion_unregister_entry(
+                               GTK_ENTRY(*(widgets_table[i].entry)));
+       }
+       address_completion_end(templates.window);
+}
+
+static void prefs_template_ok_cb(gpointer action, gpointer data)
 {
        GSList *tmpl_list;
        GtkListStore *store;
@@ -521,6 +569,9 @@ static void prefs_template_ok_cb(void)
                                 NULL) != G_ALERTDEFAULT) {
                return;
        } 
+
+       prefs_template_address_completion_end();
+
        modified = FALSE;
        modified_list = FALSE;
        tmpl_list = prefs_template_get_list();
@@ -533,7 +584,7 @@ static void prefs_template_ok_cb(void)
        inc_unlock();
 }
 
-static void prefs_template_cancel_cb(void)
+static void prefs_template_cancel_cb(gpointer action, gpointer data)
 {
        GtkListStore *store;
 
@@ -548,6 +599,9 @@ static void prefs_template_cancel_cb(void)
                                 NULL) != G_ALERTDEFAULT) {
                return;
        }
+
+       prefs_template_address_completion_end();
+
        modified = FALSE;
        modified_list = FALSE;
        store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW
@@ -588,6 +642,9 @@ static GSList *prefs_template_get_list(void)
                        ntmpl->subject = tmpl->subject && *(tmpl->subject) 
                                         ? g_strdup(tmpl->subject) 
                                         : NULL;
+                       ntmpl->from    = tmpl->from && *(tmpl->from)
+                                        ? g_strdup(tmpl->from)
+                                        : NULL;
                        ntmpl->to      = tmpl->to && *(tmpl->to)
                                         ? g_strdup(tmpl->to)
                                         : NULL;
@@ -608,29 +665,49 @@ static GSList *prefs_template_get_list(void)
        return tmpl_list;
 }
 
-gboolean prefs_template_string_is_valid(gchar *string, gint *line)
+gboolean prefs_template_string_is_valid(gchar *string, gint *line, gboolean escaped_string, gboolean email)
 {
+       gboolean result = TRUE;
        if (string && *string != '\0') {
+               gchar *tmp = NULL;
                gchar *parsed_buf;
                MsgInfo dummyinfo;
+               PrefsAccount *account = account_get_default();
 
+               if (escaped_string) {
+                       tmp = malloc(strlen(string)+1);
+                       pref_get_unescaped_pref(tmp, string);
+               } else {
+                       tmp = g_strdup(string);
+               }
                memset(&dummyinfo, 0, sizeof(MsgInfo));
-#ifdef USE_ASPELL
-               quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, NULL, NULL);
+#ifdef USE_ENCHANT
+               quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, account, FALSE, NULL);
 #else
-               quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, NULL);
+               quote_fmt_init(&dummyinfo, NULL, NULL, TRUE, account, FALSE);
 #endif
-               quote_fmt_scan_string(string);
+               quote_fmt_scan_string(tmp);
                quote_fmt_parse();
+               g_free(tmp);
                parsed_buf = quote_fmt_get_buffer();
                if (!parsed_buf) {
                        if (line)
                                *line = quote_fmt_get_line();
                        return FALSE;
                }
+               if (email) {
+                       const gchar *start = strrchr(parsed_buf, '<');
+                       const gchar *end = strrchr(parsed_buf, '>');
+                       const gchar *at = strrchr(parsed_buf, '@');
+                       const gchar *space = strrchr(parsed_buf, ' ');
+                       if (!at)
+                               result = FALSE;
+                       if (at && space && (!start || !end || end < start || start < space))
+                               result = FALSE;
+               }
                quote_fmt_reset_vartable();
        }
-       return TRUE;
+       return result;
 }
 
 static gboolean prefs_template_list_view_set_row(gint row)
@@ -639,6 +716,7 @@ static gboolean prefs_template_list_view_set_row(gint row)
        Template *tmpl;
        gchar *name;
        gchar *subject;
+       gchar *from;
        gchar *to;
        gchar *cc;
        gchar *bcc;     
@@ -659,7 +737,7 @@ static gboolean prefs_template_list_view_set_row(gint row)
                        g_free(value);
                value = NULL;
                }
-       if (!prefs_template_string_is_valid(value, &line)) {
+       if (!prefs_template_string_is_valid(value, &line, TRUE, FALSE)) {
                alertpanel_error(_("Template body format error at line %d."), line);
                g_free(value);
                return FALSE;
@@ -672,6 +750,8 @@ static gboolean prefs_template_list_view_set_row(gint row)
                g_free(value);
                return FALSE;
        }
+       from = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_from),
+                                   0, -1);
        to = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_to),
                                    0, -1);
        cc = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_cc),
@@ -681,6 +761,10 @@ static gboolean prefs_template_list_view_set_row(gint row)
        subject = gtk_editable_get_chars(GTK_EDITABLE(templates.entry_subject),
                                         0, -1);
 
+       if (from && *from == '\0') {
+               g_free(from);
+               from = NULL;
+       }
        if (to && *to == '\0') {
                g_free(to);
                to = NULL;
@@ -698,25 +782,31 @@ static gboolean prefs_template_list_view_set_row(gint row)
                subject = NULL;
        }
 
-       if (!prefs_template_string_is_valid(to, NULL)) {
+       if (!prefs_template_string_is_valid(from, NULL, TRUE, TRUE)) {
+               alertpanel_error(_("Template From format error."));
+               g_free(from);
+               g_free(value);
+               return FALSE;
+       }
+       if (!prefs_template_string_is_valid(to, NULL, TRUE, TRUE)) {
                alertpanel_error(_("Template To format error."));
                g_free(to);
                g_free(value);
                return FALSE;
        }
-       if (!prefs_template_string_is_valid(cc, NULL)) {
+       if (!prefs_template_string_is_valid(cc, NULL, TRUE, TRUE)) {
                alertpanel_error(_("Template Cc format error."));       
                g_free(cc);
                g_free(value);
                return FALSE;
        }
-       if (!prefs_template_string_is_valid(bcc, NULL)) {
+       if (!prefs_template_string_is_valid(bcc, NULL, TRUE, TRUE)) {
                alertpanel_error(_("Template Bcc format error."));      
                g_free(bcc);
                g_free(value);
                return FALSE;
        }
-       if (!prefs_template_string_is_valid(subject, NULL)) {
+       if (!prefs_template_string_is_valid(subject, NULL, TRUE, FALSE)) {
                alertpanel_error(_("Template subject format error."));  
                g_free(subject);
                g_free(value);
@@ -727,6 +817,7 @@ static gboolean prefs_template_list_view_set_row(gint row)
        tmpl->load_filename = NULL;
        tmpl->name = name;
        tmpl->subject = subject;
+       tmpl->from = from;
        tmpl->to = to;
        tmpl->cc = cc;
        tmpl->bcc = bcc;        
@@ -738,13 +829,13 @@ static gboolean prefs_template_list_view_set_row(gint row)
        return TRUE;
 }
 
-static void prefs_template_register_cb(void)
+static void prefs_template_register_cb(gpointer action, gpointer data)
 {
        modified = !prefs_template_list_view_set_row(-1);
        modified_list = TRUE;
 }
 
-static void prefs_template_substitute_cb(void)
+static void prefs_template_substitute_cb(gpointer action, gpointer data)
 {
        Template *tmpl;
        gint row;
@@ -767,7 +858,7 @@ static void prefs_template_substitute_cb(void)
        modified_list = TRUE;
 }
 
-static void prefs_template_delete_cb(void)
+static void prefs_template_delete_cb(gpointer action, gpointer data)
 {
        Template *tmpl;
        gint row;
@@ -796,7 +887,7 @@ static void prefs_template_delete_cb(void)
        modified_list = TRUE;   
 }
 
-static void prefs_template_delete_all_cb(void)
+static void prefs_template_delete_all_cb(gpointer action, gpointer data)
 {
        GtkListStore *list_store;
 
@@ -813,7 +904,7 @@ static void prefs_template_delete_all_cb(void)
        modified_list = TRUE;
 }
 
-static void prefs_template_duplicate_cb(void)
+static void prefs_template_duplicate_cb(gpointer action, gpointer data)
 {
        Template *tmpl;
        gint row;
@@ -835,12 +926,12 @@ static void prefs_template_duplicate_cb(void)
        modified_list = !prefs_template_list_view_set_row(-row-2);
 }
 
-static void prefs_template_clear_cb(void)
+static void prefs_template_clear_cb(gpointer action, gpointer data)
 {
    prefs_template_reset_dialog();
 }
 
-static void prefs_template_top_cb(void)
+static void prefs_template_top_cb(gpointer action, gpointer data)
 {
        gint row;
        GtkTreeIter top, sel;
@@ -861,7 +952,7 @@ static void prefs_template_top_cb(void)
        modified_list = TRUE;
 }
 
-static void prefs_template_up_cb(void)
+static void prefs_template_up_cb(gpointer action, gpointer data)
 {
        gint row;
        GtkTreeIter top, sel;
@@ -882,7 +973,7 @@ static void prefs_template_up_cb(void)
        modified_list = TRUE;
 }
 
-static void prefs_template_down_cb(void)
+static void prefs_template_down_cb(gpointer action, gpointer data)
 {
        gint row, n_rows;
        GtkTreeIter top, sel;
@@ -903,7 +994,7 @@ static void prefs_template_down_cb(void)
        modified_list = TRUE;
 }
 
-static void prefs_template_bottom_cb(void)
+static void prefs_template_bottom_cb(gpointer action, gpointer data)
 {
        gint row, n_rows;
        GtkTreeIter top, sel;
@@ -989,14 +1080,15 @@ static void prefs_template_list_view_insert_template(GtkWidget *list_view,
        }
 }
 
-static GtkItemFactory *prefs_template_popup_factory = NULL;
+static GtkActionGroup *prefs_template_popup_action = NULL;
 static GtkWidget *prefs_template_popup_menu = NULL;
 
-static GtkItemFactoryEntry prefs_template_popup_entries[] =
+static GtkActionEntry prefs_template_popup_entries[] =
 {
-   {N_("/_Delete"),            NULL, prefs_template_delete_cb, 0, NULL, NULL},
-   {N_("/Delete _all"),        NULL, prefs_template_delete_all_cb, 0, NULL, NULL},
-   {N_("/D_uplicate"), NULL, prefs_template_duplicate_cb, 0, NULL, NULL},
+       {"PrefsTemplatePopup",                  NULL, "PrefsTemplatePopup" },
+       {"PrefsTemplatePopup/Delete",           NULL, N_("_Delete"), NULL, NULL, G_CALLBACK(prefs_template_delete_cb) },
+       {"PrefsTemplatePopup/DeleteAll",        NULL, N_("Delete _all"), NULL, NULL, G_CALLBACK(prefs_template_delete_all_cb) },
+       {"PrefsTemplatePopup/Duplicate",        NULL, N_("D_uplicate"), NULL, NULL, G_CALLBACK(prefs_template_duplicate_cb) },
 };
 
 static gint prefs_template_list_btn_pressed(GtkWidget *widget, GdkEventButton *event,
@@ -1022,24 +1114,27 @@ static gint prefs_template_list_btn_pressed(GtkWidget *widget, GdkEventButton *e
                   gint row;
 
                   if (!prefs_template_popup_menu) {
-                          gint n_entries = sizeof(prefs_template_popup_entries) /
-                                          sizeof(prefs_template_popup_entries[0]);
-                          prefs_template_popup_menu = menu_create_items(prefs_template_popup_entries,
-                                                                n_entries, "<PrefsTemplatePopupMenu>",
-                                                                &prefs_template_popup_factory, list_view);
+                               prefs_template_popup_action = cm_menu_create_action_group("PrefsTemplatePopup", prefs_template_popup_entries,
+                                       G_N_ELEMENTS(prefs_template_popup_entries), (gpointer)list_view);
+                               MENUITEM_ADDUI("/Menus", "PrefsTemplatePopup", "PrefsTemplatePopup", GTK_UI_MANAGER_MENU)
+                               MENUITEM_ADDUI("/Menus/PrefsTemplatePopup", "Delete", "PrefsTemplatePopup/Delete", GTK_UI_MANAGER_MENUITEM)
+                               MENUITEM_ADDUI("/Menus/PrefsTemplatePopup", "DeleteAll", "PrefsTemplatePopup/DeleteAll", GTK_UI_MANAGER_MENUITEM)
+                               MENUITEM_ADDUI("/Menus/PrefsTemplatePopup", "Duplicate", "PrefsTemplatePopup/Duplicate", GTK_UI_MANAGER_MENUITEM)
+                               prefs_template_popup_menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(
+                                       gtk_ui_manager_get_widget(gtkut_ui_manager(), "/Menus/PrefsTemplatePopup")) );
                   }
 
                   /* grey out some popup menu items if there is no selected row */
                   row = gtkut_list_view_get_selected_row(GTK_WIDGET(list_view));
-                  menu_set_sensitive(prefs_template_popup_factory, "/Delete", (row > 0));
-                  menu_set_sensitive(prefs_template_popup_factory, "/Duplicate", (row > 0));
+                       cm_menu_set_sensitive("PrefsTemplatePopup/Delete", (row > 0));
+                       cm_menu_set_sensitive("PrefsTemplatePopup/Duplicate", (row > 0));
 
                   /* grey out seom popup menu items if there is no row
                          (not counting the (New) one at row 0) */
                   non_empty = gtk_tree_model_get_iter_first(model, &iter);
                   if (non_empty)
                           non_empty = gtk_tree_model_iter_next(model, &iter);
-                  menu_set_sensitive(prefs_template_popup_factory, "/Delete all", non_empty);
+                       cm_menu_set_sensitive("PrefsTemplatePopup/DeleteAll", non_empty);
 
                   gtk_menu_popup(GTK_MENU(prefs_template_popup_menu), 
                                          NULL, NULL, NULL, NULL, 
@@ -1108,6 +1203,7 @@ static void prefs_template_create_list_view_columns(GtkWidget *list_view)
                         "text", TEMPL_TEXT,
                         NULL);
        gtk_tree_view_append_column(GTK_TREE_VIEW(list_view), column);          
+       gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(list_view), prefs_template_search_func_cb , NULL, NULL);
 }
 
  /*!
@@ -1132,6 +1228,7 @@ static void prefs_template_select_row(GtkTreeView *list_view, GtkTreePath *path)
 
        tmpl_def.name = _("Template");
        tmpl_def.subject = "";
+       tmpl_def.from = "";
        tmpl_def.to = "";
        tmpl_def.cc = "";
        tmpl_def.bcc = "";      
@@ -1142,6 +1239,8 @@ static void prefs_template_select_row(GtkTreeView *list_view, GtkTreePath *path)
                tmpl = &tmpl_def;
 
        gtk_entry_set_text(GTK_ENTRY(templates.entry_name), tmpl->name);
+       gtk_entry_set_text(GTK_ENTRY(templates.entry_from),
+                          tmpl->from ? tmpl->from : "");
        gtk_entry_set_text(GTK_ENTRY(templates.entry_to),
                           tmpl->to ? tmpl->to : "");
        gtk_entry_set_text(GTK_ENTRY(templates.entry_cc),