From bb4fe9097dae2f080cba9cd413fd0580fa2ada34 Mon Sep 17 00:00:00 2001 From: Jim Nelson Date: Thu, 30 Aug 2012 17:47:03 -0700 Subject: [PATCH] Display "(no subject)" when message has no subject: Closes #5322 --- src/client/ui/message-list-cell-renderer.vala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/client/ui/message-list-cell-renderer.vala b/src/client/ui/message-list-cell-renderer.vala index 868e3a5a..2570242f 100644 --- a/src/client/ui/message-list-cell-renderer.vala +++ b/src/client/ui/message-list-cell-renderer.vala @@ -107,11 +107,12 @@ public class FormattedMessageData : Object { string subject_string = email.get_subject_as_string(); try { Regex subject_regex = new Regex("^(?i:Re:\\s*)+"); - return subject_regex.replace(subject_string, -1, 0, ""); + subject_string = subject_regex.replace(subject_string, -1, 0, ""); } catch (RegexError e) { - debug("Failed to clean up subject line: %s", e.message); - return subject_string; + debug("Failed to clean up subject line \"%s\": %s", subject_string, e.message); } + + return !Geary.String.is_empty_or_whitespace(subject_string) ? subject_string : _("(no subject)"); } public void render(Cairo.Context ctx, Gtk.Widget widget, Gdk.Rectangle background_area,