[Xfce4-commits] <postler:master> Don't call into Dexter in GetMessage

[Christian Dywan]

Updating branch refs/heads/master
         to c98130270d6800f729e89b55a19be45a614f0af5 (commit)
       from b84041125ee01d95d6437419226c5ab55d5b75b1 (commit)

commit c98130270d6800f729e89b55a19be45a614f0af5
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Jul 1 02:40:09 2011 +0200

    Don't call into Dexter in GetMessage
    
    We can't afford the response time, this will need to be
    handled differently.

 postler/postler-index.vala |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/postler/postler-index.vala b/postler/postler-index.vala
index 1d77f38..fa42b8f 100644
--- a/postler/postler-index.vala
+++ b/postler/postler-index.vala
@@ -70,6 +70,7 @@ namespace Postler {
                 return;
 
             names = new GLib.HashTable<string,Postler.Contact> (str_hash, str_equal);
+            /* FIXME: Populate addresses from Dexter */
 #if HAVE_FOLKS
             aggregator = new Folks.IndividualAggregator ();
             /* FIXME: Connect to aggregator.individuals_changed */
@@ -364,10 +365,6 @@ namespace Postler {
             if (address_is_user (address))
                 return new Postler.Contact (_("You"), null);
 
-            string? display_name = new Dexter.Dexter ().get_name (address);
-            if (display_name != null)
-                return new Postler.Contact (display_name, null);
-
             if (statement_guess == null) {
                 if (database.prepare_v2 ("""
                     SELECT sender FROM messages WHERE sender LIKE ?1
@@ -385,7 +382,7 @@ namespace Postler {
                 throw new GLib.FileError.FAILED (_("Failed to guess name: %s"), database.errmsg ());
             }
             if (result == Sqlite.ROW) {
-                display_name = Postler.Contact.name_from_string (statement_guess.column_text (0));
+                string display_name = Postler.Contact.name_from_string (statement_guess.column_text (0));
                 statement_guess.reset ();
                 return new Postler.Contact (display_name, null);
             }