[Xfce4-commits] <postler:master> Parse Mozilla style mail reader names

[Christian Dywan]

Updating branch refs/heads/master
         to ca7e6d033a8c2ac3647a3f1600459a0641131dca (commit)
       from e7f9007e6568a605cc675dfb1ba76c6a1bbbb19b (commit)

commit ca7e6d033a8c2ac3647a3f1600459a0641131dca
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Jun 22 21:05:54 2010 +0200

    Parse Mozilla style mail reader names

 postler/postler-content.vala |   12 ++++++++----
 tests/parsing.vala           |    3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index 40ca6aa..796ef76 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -91,12 +91,16 @@ public class Postler.Content : WebKit.WebView {
     }
 
     internal static string format_x_mailer (string x_mailer) {
+        string mailer = x_mailer.chomp ();
+        if (") " in mailer)
+            return mailer.rchr (-1, ' ').chug ().replace ("/", " ");
+
         int bracket = 0;
-        while (x_mailer[bracket] != '(' && x_mailer[bracket] != '\0')
+        while (mailer[bracket] != '(' && mailer[bracket] != '\0')
             bracket++;
-        if (x_mailer[bracket] == '\0')
-            return x_mailer.chomp ();
-        return x_mailer.substring (0, bracket).chomp ();
+        if (mailer[bracket] == '\0')
+            return mailer;
+        return mailer.substring (0, bracket).chomp ();
     }
 
     internal static string linkify_address (string address, string? arguments) {
diff --git a/tests/parsing.vala b/tests/parsing.vala
index 691bb3e..6ec88b2 100644
--- a/tests/parsing.vala
+++ b/tests/parsing.vala
@@ -45,7 +45,8 @@ const TestCase[] mailers = {
     { "SAP Web 7.00", "SAP Web 7.00" },
     { "Apple Mail (2.936)", "Apple Mail" },
     { "Evolution 2.30.1 ", "Evolution 2.30.1" },
-    { "Evolution 2.28.3 (2.28.3-1.fc12) ", "Evolution 2.28.3" }
+    { "Evolution 2.28.3 (2.28.3-1.fc12) ", "Evolution 2.28.3" },
+    { "Mozilla/5.0 (X11; U) Gecko/201 Thunderbird/3.0.4", "Thunderbird 3.0.4" }
 };
 
 void parsing_headers_mailer () {