aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-autofilter.c9
2 files changed, 10 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 76e3a63141..0acb7ea575 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-14 Zbigniew Chyla <cyba@gnome.pl>
+
+ * mail-autofilter.c (rule_match_recipients, rule_from_message,
+ rule_from_mlist): s/_/U_/ (filter_rule_set_name requires UTF-8 string)
+
2001-11-14 Dan Winship <danw@ximian.com>
* main.c (segv_redirect): Instead of doing pthread_exit() after
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 43bba61c57..eba956e1f1 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -33,6 +33,7 @@
#include <libgnomeui/gnome-app.h>
#include <libgnomeui/gnome-app-helper.h>
#include <libgnomeui/gnome-popup-menu.h>
+#include <gal/util/e-unicode-i18n.h>
#include "mail-vfolder.h"
#include "mail-autofilter.h"
@@ -68,7 +69,7 @@ rule_match_recipients (RuleContext *context, FilterRule *rule, CamelInternetAddr
element = filter_part_find_element (part, "recipient");
filter_input_set_value ((FilterInput *)element, addr);
- namestr = g_strdup_printf (_("Mail to %s"), real && real[0] ? real : addr);
+ namestr = g_strdup_printf (U_("Mail to %s"), real && real[0] ? real : addr);
filter_rule_set_name (rule, namestr);
g_free (namestr);
}
@@ -211,7 +212,7 @@ rule_from_message (FilterRule *rule, RuleContext *context, CamelMimeMessage *msg
rule_match_subject (context, rule, msg->subject);
- namestr = g_strdup_printf (_("Subject is %s"), strip_re (msg->subject));
+ namestr = g_strdup_printf (U_("Subject is %s"), strip_re (msg->subject));
filter_rule_set_name (rule, namestr);
g_free (namestr);
}
@@ -227,7 +228,7 @@ rule_from_message (FilterRule *rule, RuleContext *context, CamelMimeMessage *msg
rule_add_sender(context, rule, addr);
if (name==NULL || name[0]==0)
name = addr;
- namestr = g_strdup_printf(_("Mail from %s"), name);
+ namestr = g_strdup_printf(U_("Mail from %s"), name);
filter_rule_set_name(rule, namestr);
g_free(namestr);
}
@@ -283,7 +284,7 @@ rule_from_mlist(FilterRule *rule, RuleContext *context, const char *mlist)
element = filter_part_find_element (part, "mlist");
filter_input_set_value((FilterInput *)element, mlist);
- rule_name = g_strdup_printf(_("%s mailing list"), mlist);
+ rule_name = g_strdup_printf(U_("%s mailing list"), mlist);
filter_rule_set_name((FilterRule *) rule, rule_name);
g_free (rule_name);
}