aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/folder-browser.c24
-rw-r--r--mail/mail-tools.c35
3 files changed, 32 insertions, 32 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8c4d48caf5..0126bf2156 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-18 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-tools.c (mail_tool_generate_forward_subject): Do what was
+ suggested in #4596.
+
2001-07-18 Peter Williams <peterw@ximian.com>
* mail-accounts.c (construct): Add GTK_WIDGET to the charset
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 12af53f9e2..8f9c886c63 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1611,23 +1611,23 @@ folder_browser_gui_init (FolderBrowser *fb)
/* quick-search bar */
{
RuleContext *rc = (RuleContext *)rule_context_new ();
- char *user = g_strdup_printf("%s/searches.xml", evolution_dir);
+ char *user = g_strdup_printf ("%s/searches.xml", evolution_dir);
/* we reuse the vfolder types here, they should match */
char *system = EVOLUTION_DATADIR "/evolution/vfoldertypes.xml";
-
- rule_context_add_part_set((RuleContext *)rc, "partset", filter_part_get_type(),
- rule_context_add_part, rule_context_next_part);
- rule_context_add_rule_set((RuleContext *)rc, "ruleset", filter_rule_get_type(),
- rule_context_add_rule, rule_context_next_rule);
-
- fb->search = e_filter_bar_new(rc, system, user, folder_browser_config_search, fb);
- e_search_bar_set_menu((ESearchBar *)fb->search, folder_browser_search_menu_items);
+ rule_context_add_part_set ((RuleContext *)rc, "partset", filter_part_get_type (),
+ rule_context_add_part, rule_context_next_part);
+
+ rule_context_add_rule_set ((RuleContext *)rc, "ruleset", filter_rule_get_type (),
+ rule_context_add_rule, rule_context_next_rule);
+
+ fb->search = e_filter_bar_new (rc, system, user, folder_browser_config_search, fb);
+ e_search_bar_set_menu ((ESearchBar *)fb->search, folder_browser_search_menu_items);
/*e_search_bar_set_option((ESearchBar *)fb->search, folder_browser_search_option_items);*/
- g_free(user);
- gtk_object_unref((GtkObject *)rc);
+ g_free (user);
+ gtk_object_unref (GTK_OBJECT (rc));
}
-
+
gtk_widget_show (GTK_WIDGET (fb->search));
gtk_signal_connect (GTK_OBJECT (fb->search), "query_changed",
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index c72a5d2d02..cd31fa067f 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -193,30 +193,25 @@ char *
mail_tool_generate_forward_subject (CamelMimeMessage *msg)
{
const char *subject;
- char *fwd_subj, *fromstr;
- const CamelInternetAddress *from;
-
- from = camel_mime_message_get_from(msg);
+ char *fwd_subj;
+
subject = camel_mime_message_get_subject(msg);
-
- if (from) {
- fromstr = camel_address_format((CamelAddress *)from);
- if (subject && *subject) {
- fwd_subj = g_strdup_printf ("[%s] %s", fromstr, subject);
- } else {
- fwd_subj = g_strdup_printf (_("[%s] (forwarded message)"),
- fromstr);
- }
- g_free(fromstr);
+
+ if (subject && *subject) {
+ fwd_subj = g_strdup_printf ("[Fwd: %s]", subject);
} else {
- if (subject && *subject) {
- if (strncmp (subject, "Fwd: ", 5) == 0)
- subject += 4;
- fwd_subj = g_strdup_printf ("Fwd: %s", subject);
+ const CamelInternetAddress *from;
+ char *fromstr;
+
+ from = camel_mime_message_get_from (msg);
+ if (from) {
+ fromstr = camel_address_format (CAMEL_ADDRESS (from));
+ fwd_subj = g_strdup_printf ("[Fwd: %s]", fromstr);
+ g_free (fromstr);
} else
- fwd_subj = g_strdup (_("Fwd: (no subject)"));
+ fwd_subj = g_strdup (_("[Fwd: No Subject]"));
}
-
+
return fwd_subj;
}