Do not load avatar from cache if token is empty. Fixes bug #517098.

[empathy.git] / libempathy / empathy-log-manager.c

diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index 4313bc2cf047de6b0f794d217be79c974718da03..096761841457a30366b4aec77d97aff67f65544f 100644 (file)
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -1,5 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
+ * Copyright (C) 2003-2007 Imendio AB
  * Copyright (C) 2007 Collabora Ltd.
  *
  * This program is free software; you can redistribute it and/or
@@ -16,7 +17,7 @@
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
- * 
+ *
  * Authors: Xavier Claessens <xclaesse@gmail.com>
  */
 
@@ -24,6 +25,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <glib/gstdio.h>
 
 #include "empathy-log-manager.h"
@@ -136,12 +138,15 @@ empathy_log_manager_add_message (EmpathyLogManager *manager,
        EmpathyContact *sender;
        const gchar   *body_str;
        const gchar   *str;
+       EmpathyAvatar *avatar;
+       gchar         *avatar_token = NULL;
        gchar         *filename;
        gchar         *basedir;
        gchar         *body;
        gchar         *timestamp;
        gchar         *contact_name;
        gchar         *contact_id;
+       EmpathyMessageType msg_type;
 
        g_return_if_fail (EMPATHY_IS_LOG_MANAGER (manager));
        g_return_if_fail (chat_id != NULL);
@@ -150,6 +155,7 @@ empathy_log_manager_add_message (EmpathyLogManager *manager,
        sender = empathy_message_get_sender (message);
        account = empathy_contact_get_account (sender);
        body_str = empathy_message_get_body (message);
+       msg_type = empathy_message_get_type (message);
 
        if (G_STR_EMPTY (body_str)) {
                return;
@@ -189,12 +195,19 @@ empathy_log_manager_add_message (EmpathyLogManager *manager,
        str = empathy_contact_get_id (sender);
        contact_id = g_markup_escape_text (str, -1);
 
+       avatar = empathy_contact_get_avatar (sender);
+       if (avatar) {
+               avatar_token = g_markup_escape_text (avatar->token, -1);                
+       }
+
        g_fprintf (file,
-                  "<message time='%s' id='%s' name='%s' isuser='%s'>%s</message>\n" LOG_FOOTER,
+                  "<message time='%s' id='%s' name='%s' token='%s' isuser='%s' type='%s'>%s</message>\n" LOG_FOOTER,
                   timestamp,
                   contact_id,
                   contact_name,
+                  avatar_token ? avatar_token : "",
                   empathy_contact_is_user (sender) ? "true" : "false",
+                  empathy_message_type_to_str (msg_type),
                   body);
 
        fclose (file);
@@ -203,6 +216,7 @@ empathy_log_manager_add_message (EmpathyLogManager *manager,
        g_free (contact_name);
        g_free (timestamp);
        g_free (body);
+       g_free (avatar_token);
 }
 
 gboolean
@@ -259,6 +273,10 @@ empathy_log_manager_get_dates (EmpathyLogManager *manager,
                        continue;
                }
 
+               if (!g_regex_match_simple ("\\d{8}", date, 0, 0)) {
+                       continue;
+               }
+
                dates = g_list_insert_sorted (dates, date, (GCompareFunc) strcmp);
        }
 
@@ -318,15 +336,19 @@ empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager,
 
        /* Now get the messages. */
        for (node = log_node->children; node; node = node->next) {
-               EmpathyMessage *message;
-               EmpathyContact *sender;
-               gchar         *time;
-               EmpathyTime     t;
-               gchar         *sender_id;
-               gchar         *sender_name;
-               gchar         *body;
-               gchar         *is_user_str;
-               gboolean       is_user = FALSE;
+               EmpathyMessage     *message;
+               EmpathyContact     *sender;
+               EmpathyAvatar      *avatar = NULL;
+               gchar              *time;
+               time_t              t;
+               gchar              *sender_id;
+               gchar              *sender_name;
+               gchar              *sender_avatar_token;
+               gchar              *body;
+               gchar              *is_user_str;
+               gboolean            is_user = FALSE;
+               gchar              *msg_type_str;
+               EmpathyMessageType  msg_type = EMPATHY_MESSAGE_TYPE_NORMAL;
 
                if (strcmp (node->name, "message") != 0) {
                        continue;
@@ -336,19 +358,33 @@ empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager,
                time = xmlGetProp (node, "time");
                sender_id = xmlGetProp (node, "id");
                sender_name = xmlGetProp (node, "name");
+               sender_avatar_token = xmlGetProp (node, "token");
                is_user_str = xmlGetProp (node, "isuser");
+               msg_type_str = xmlGetProp (node, "type");
 
+               if (!G_STR_EMPTY (sender_avatar_token)) {
+                       avatar = empathy_avatar_new_from_cache (sender_avatar_token);
+               }
                if (is_user_str) {
                        is_user = strcmp (is_user_str, "true") == 0;
                }
+               if (msg_type_str) {
+                       msg_type = empathy_message_type_from_str (msg_type_str);
+               }
 
                t = empathy_time_parse (time);
 
                sender = empathy_contact_new_full (account, sender_id, sender_name);
                empathy_contact_set_is_user (sender, is_user);
+               if (avatar) {
+                       empathy_contact_set_avatar (sender, avatar);
+                       empathy_avatar_unref (avatar);
+               }
+
                message = empathy_message_new (body);
                empathy_message_set_sender (message, sender);
                empathy_message_set_timestamp (message, t);
+               empathy_message_set_type (message, msg_type);
 
                messages = g_list_append (messages, message);
 
@@ -357,6 +393,8 @@ empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager,
                xmlFree (sender_id);
                xmlFree (sender_name);
                xmlFree (body);
+               xmlFree (is_user_str);
+               xmlFree (msg_type_str);
        }
 
        empathy_debug (DEBUG_DOMAIN, "Parsed %d messages", g_list_length (messages));
@@ -510,7 +548,7 @@ empathy_log_manager_search_free (GList *hits)
 gchar *
 empathy_log_manager_get_date_readable (const gchar *date)
 {
-       EmpathyTime t;
+       time_t t;
 
        t = empathy_time_parse (date);
 
@@ -621,24 +659,22 @@ log_manager_get_dir (EmpathyLogManager *manager,
 {
        const gchar *account_id;
        gchar       *basedir;
-       gchar       *str;
 
        account_id = mc_account_get_unique_name (account);
-       basedir = 
-       str = g_build_path (G_DIR_SEPARATOR_S,
-                           log_manager_get_basedir (manager),
-                           account_id,
-                           chat_id,
-                           NULL);
 
        if (chatroom) {
                basedir = g_build_path (G_DIR_SEPARATOR_S,
-                                       str,
+                                       log_manager_get_basedir (manager),
+                                       account_id,
                                        LOG_DIR_CHATROOMS,
+                                       chat_id,
                                        NULL);
-               g_free (str);
        } else {
-               basedir = str;
+               basedir = g_build_path (G_DIR_SEPARATOR_S,
+                                       log_manager_get_basedir (manager),
+                                       account_id,
+                                       chat_id,
+                                       NULL);
        }
 
        return basedir;
@@ -688,7 +724,7 @@ log_manager_get_filename_for_date (EmpathyLogManager *manager,
 static gchar *
 log_manager_get_timestamp_filename (void)
 {
-       EmpathyTime  t;
+       time_t      t;
        gchar      *time_str;
        gchar      *filename;
 
@@ -704,7 +740,7 @@ log_manager_get_timestamp_filename (void)
 static gchar *
 log_manager_get_timestamp_from_message (EmpathyMessage *message)
 {
-       EmpathyTime t;
+       time_t t;
 
        t = empathy_message_get_timestamp (message);