aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@helixcode.com>2000-08-08 02:24:44 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2000-08-08 02:24:44 +0800
commit725c2912fc8e06f14685a07284200be1ede581bf (patch)
treea9e59d5cb87cd8550b9a0f7655568bfd3d4a6a39
parentc2b4339041465f502db05e7042db2a053d8fef8e (diff)
downloadgsoc2013-evolution-725c2912fc8e06f14685a07284200be1ede581bf.tar
gsoc2013-evolution-725c2912fc8e06f14685a07284200be1ede581bf.tar.gz
gsoc2013-evolution-725c2912fc8e06f14685a07284200be1ede581bf.tar.bz2
gsoc2013-evolution-725c2912fc8e06f14685a07284200be1ede581bf.tar.lz
gsoc2013-evolution-725c2912fc8e06f14685a07284200be1ede581bf.tar.xz
gsoc2013-evolution-725c2912fc8e06f14685a07284200be1ede581bf.tar.zst
gsoc2013-evolution-725c2912fc8e06f14685a07284200be1ede581bf.zip
Get rid of kludge around subject beginning with spaces.
2000-08-07 Jeffrey Stedfast <fejj@helixcode.com> * mail-format.c (write_headers): Get rid of kludge around subject beginning with spaces. (mail_generate_reply): Get rid of kludge around subject beginning with spaces and also use g_strncasecmp instead of strncasecmp for portability * mail-ops.c (forward_msg): Get rid of kludges around subject beginning with spaces. svn path=/trunk/; revision=4572
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/mail-format.c7
-rw-r--r--mail/mail-ops.c6
3 files changed, 15 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index ab6a0fe208..a72ff8b00f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2000-08-07 Jeffrey Stedfast <fejj@helixcode.com>
+
+ * mail-format.c (write_headers): Get rid of kludge around subject
+ beginning with spaces.
+ (mail_generate_reply): Get rid of kludge around subject beginning
+ with spaces and also use g_strncasecmp instead of strncasecmp for
+ portability
+
+ * mail-ops.c (forward_msg): Get rid of kludges around subject
+ beginning with spaces.
+
2000-08-07 Dan Winship <danw@helixcode.com>
* message-list.c (message_list_select): Clarify that the input row
diff --git a/mail/mail-format.c b/mail/mail-format.c
index dad21688f4..41dbac4a3b 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -490,7 +490,7 @@ write_headers (CamelMimeMessage *message, struct mail_format_data *mfd)
recipients = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_CC);
write_recipients_to_stream ("Cc:", recipients, TRUE, TRUE,
mfd->html, mfd->stream);
- write_field_to_stream ("Subject:",
+ write_field_to_stream ("Subject: ",
camel_mime_message_get_subject (message),
TRUE, mfd->html, mfd->stream);
@@ -1748,10 +1748,7 @@ mail_generate_reply (CamelMimeMessage *message, gboolean to_all)
if (!subject)
subject = g_strdup ("");
else {
- while (*subject == ' ')
- subject++;
-
- if (!strncasecmp (subject, "Re: ", 4))
+ if (!g_strncasecmp (subject, "Re: ", 4))
subject = g_strdup (subject);
else
subject = g_strdup_printf ("Re: %s", subject);
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index aa0323e842..41211d20ea 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -571,8 +571,8 @@ composer_send_cb (EMsgComposer *composer, gpointer data)
message = e_msg_composer_get_message (composer);
subject = camel_mime_message_get_subject (message);
- if (subject == NULL || subject[0] == '\0') {
- if (! ask_confirm_for_empty_subject (composer)) {
+ if (!subject || !*subject) {
+ if (!ask_confirm_for_empty_subject (composer)) {
gtk_object_unref (GTK_OBJECT (message));
return;
}
@@ -750,8 +750,6 @@ forward_msg (GtkWidget *button, gpointer user_data)
subject = camel_mime_message_get_subject (cursor_msg);
if (from) {
if (subject && *subject) {
- while (*subject == ' ')
- subject++;
fwd_subj = g_strdup_printf ("[%s] %s", from, subject);
} else {
fwd_subj = g_strdup_printf ("[%s] (forwarded message)",