aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/em-mailer-prefs.c12
2 files changed, 14 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ed94c956ba..f8ecdacc24 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-28 Hiroyuki Ikezoe <poincare@ikezoe.net>
+
+ ** Fix for bug #576845
+
+ * em-mailr-prefs.c: (init_junk_tree):
+ Call jh_tree_refill instead of label_tree_refill.
+
2009-03-24 Milan Crha <mcrha@redhat.com>
** Fix for bug #552583
@@ -40,7 +47,7 @@
Revert evolution revision 37063 (workaround for bug 563867).
** Part of the fix for bug #549838
-
+
2009-02-26 Andre Klapper <a9016009@gmx.de>
* message-tag-followup-c:
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index ef9aa94aa5..7a3aeed737 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -417,27 +417,27 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data)
static GtkListStore *
-init_junk_tree (GtkWidget *label_tree, EMMailerPrefs *prefs)
+init_junk_tree (GtkWidget *jh_tree, EMMailerPrefs *prefs)
{
GtkListStore *store;
GtkCellRenderer *renderer;
gint col;
- g_return_val_if_fail (label_tree != NULL, NULL);
+ g_return_val_if_fail (jh_tree != NULL, NULL);
g_return_val_if_fail (prefs != NULL, NULL);
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
- gtk_tree_view_set_model (GTK_TREE_VIEW (label_tree), GTK_TREE_MODEL (store));
+ gtk_tree_view_set_model (GTK_TREE_VIEW (jh_tree), GTK_TREE_MODEL (store));
renderer = gtk_cell_renderer_text_new ();
- col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (label_tree), -1, _("Header"), renderer, "text", JH_LIST_COLUMN_NAME, NULL);
+ col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (jh_tree), -1, _("Header"), renderer, "text", JH_LIST_COLUMN_NAME, NULL);
g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
renderer = gtk_cell_renderer_text_new ();
- gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (label_tree), -1, _("Contains Value"), renderer, "text", JH_LIST_COLUMN_VALUE, NULL);
+ gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (jh_tree), -1, _("Contains Value"), renderer, "text", JH_LIST_COLUMN_VALUE, NULL);
g_object_set (G_OBJECT (renderer), "editable", TRUE, NULL);
- label_tree_refill (NULL, 0, NULL, prefs);
+ jh_tree_refill (prefs);
return store;
}