/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * Copyright (C) 2007 Collabora Ltd.
+ * Copyright (C) 2003-2007 Imendio AB
+ * Copyright (C) 2007-2008 Collabora Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* 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>
*/
#include "empathy-log-manager.h"
#include "empathy-contact.h"
#include "empathy-time.h"
-#include "empathy-debug.h"
#include "empathy-utils.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
+#include "empathy-debug.h"
+
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
EMPATHY_TYPE_LOG_MANAGER, EmpathyLogManagerPriv))
-#define DEBUG_DOMAIN "LogManager"
-
#define LOG_DIR_CREATE_MODE (S_IRUSR | S_IWUSR | S_IXUSR)
#define LOG_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
#define LOG_DIR_CHATROOMS "chatrooms"
EmpathyContact *sender;
const gchar *body_str;
const gchar *str;
+ EmpathyAvatar *avatar;
+ gchar *avatar_token = NULL;
gchar *filename;
gchar *basedir;
gchar *body;
filename = log_manager_get_filename (manager, account, chat_id, chatroom);
basedir = g_path_get_dirname (filename);
if (!g_file_test (basedir, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
- empathy_debug (DEBUG_DOMAIN, "Creating directory:'%s'", basedir);
+ DEBUG ("Creating directory:'%s'", basedir);
g_mkdir_with_parents (basedir, LOG_DIR_CREATE_MODE);
}
g_free (basedir);
- empathy_debug (DEBUG_DOMAIN, "Adding message: '%s' to file: '%s'",
- body_str, filename);
+ DEBUG ("Adding message: '%s' to file: '%s'", body_str, filename);
if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
file = g_fopen (filename, "w+");
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' type='%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);
g_free (contact_name);
g_free (timestamp);
g_free (body);
+ g_free (avatar_token);
}
gboolean
directory = log_manager_get_dir (manager, account, chat_id, chatroom);
dir = g_dir_open (directory, 0, NULL);
if (!dir) {
- empathy_debug (DEBUG_DOMAIN, "Could not open directory:'%s'", directory);
+ DEBUG ("Could not open directory:'%s'", directory);
g_free (directory);
return NULL;
}
- empathy_debug (DEBUG_DOMAIN, "Collating a list of dates in:'%s'", directory);
+ DEBUG ("Collating a list of dates in:'%s'", directory);
while ((filename = g_dir_read_name (dir)) != NULL) {
if (!g_str_has_suffix (filename, LOG_FILENAME_SUFFIX)) {
g_free (directory);
g_dir_close (dir);
- empathy_debug (DEBUG_DOMAIN, "Parsed %d dates", g_list_length (dates));
+ DEBUG ("Parsed %d dates", g_list_length (dates));
return dates;
}
g_return_val_if_fail (EMPATHY_IS_LOG_MANAGER (manager), NULL);
g_return_val_if_fail (filename != NULL, NULL);
- empathy_debug (DEBUG_DOMAIN, "Attempting to parse filename:'%s'...", filename);
+ DEBUG ("Attempting to parse filename:'%s'...", filename);
if (!g_file_test (filename, G_FILE_TEST_EXISTS)) {
- empathy_debug (DEBUG_DOMAIN, "Filename:'%s' does not exist", filename);
+ DEBUG ("Filename:'%s' does not exist", filename);
return NULL;
}
for (node = log_node->children; node; node = node->next) {
EmpathyMessage *message;
EmpathyContact *sender;
+ EmpathyAvatar *avatar = NULL;
gchar *time;
- EmpathyTime t;
+ time_t t;
gchar *sender_id;
gchar *sender_name;
+ gchar *sender_avatar_token;
gchar *body;
gchar *is_user_str;
gboolean is_user = FALSE;
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;
}
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);
xmlFree (msg_type_str);
}
- empathy_debug (DEBUG_DOMAIN, "Parsed %d messages", g_list_length (messages));
+ DEBUG ("Parsed %d messages", g_list_length (messages));
xmlFreeDoc (doc);
xmlFreeParserCtxt (ctxt);
text_casefold = g_utf8_casefold (text, -1);
files = log_manager_get_all_files (manager, NULL);
- empathy_debug (DEBUG_DOMAIN, "Found %d log files in total",
- g_list_length (files));
+ DEBUG ("Found %d log files in total", g_list_length (files));
for (l = files; l; l = l->next) {
gchar *filename;
if (hit) {
hits = g_list_prepend (hits, hit);
- empathy_debug (DEBUG_DOMAIN,
- "Found text:'%s' in file:'%s' on date:'%s'...",
- text, hit->filename, hit->date);
+ DEBUG ("Found text:'%s' in file:'%s' on date:'%s'",
+ text, hit->filename, hit->date);
}
}
gchar *
empathy_log_manager_get_date_readable (const gchar *date)
{
- EmpathyTime t;
+ time_t t;
t = empathy_time_parse (date);
static gchar *
log_manager_get_timestamp_filename (void)
{
- EmpathyTime t;
+ time_t t;
gchar *time_str;
gchar *filename;
static gchar *
log_manager_get_timestamp_from_message (EmpathyMessage *message)
{
- EmpathyTime t;
+ time_t t;
t = empathy_message_get_timestamp (message);
projects / empathy.git / blobdiff