Add message type in log files. Fixes bug #459579.

2007-07-27 Xavier Claessens  <xclaesse@gmail.com>

	* libempathy/empathy-message.c:
	* libempathy/empathy-message.h:
	* libempathy/empathy-log-manager.c: Add message type in log files.
	Fixes bug #459579.

	* doc/*: Updated.


svn path=/trunk/; revision=205

6 files changed, 97 insertions, 35 deletions

diff --git a/ChangeLog b/ChangeLog
index 10d392393..00df367bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-27 Xavier Claessens  <xclaesse@gmail.com>
+
+	* libempathy/empathy-message.c:
+	* libempathy/empathy-message.h:
+	* libempathy/empathy-log-manager.c: Add message type in log files.
+	Fixes bug #459579.
+
+	* doc/*: Updated.
+
 2007-07-26 Xavier Claessens  <xclaesse@gmail.com>
 
 	* po/POTFILES.in: Add missing file
diff --git a/doc/libempathy-gtk/libempathy-gtk.types b/doc/libempathy-gtk/libempathy-gtk.types
index 56a9982e9..50c8f0896 100644
--- a/doc/libempathy-gtk/libempathy-gtk.types
+++ b/doc/libempathy-gtk/libempathy-gtk.types
@@ -1,5 +1,6 @@
 #include <libempathy-gtk/empathy-cell-renderer-text.h>
 #include <libempathy-gtk/empathy-contact-list-store.h>
+#include <libempathy-gtk/empathy-account-chooser.h>
 #include <libempathy-gtk/empathy-chat.h>
 #include <libempathy-gtk/empathy-chat-window.h>
 #include <libempathy-gtk/empathy-contact-list-view.h>
@@ -14,6 +15,7 @@
 
 empathy_cell_renderer_text_get_type
 empathy_contact_list_store_get_type
+empathy_account_chooser_get_type
 empathy_chat_get_type
 empathy_chat_window_get_type
 empathy_contact_list_view_get_type
diff --git a/doc/libempathy-gtk/tmpl/empathy-account-chooser.sgml b/doc/libempathy-gtk/tmpl/empathy-account-chooser.sgml
index 9db0bf2a1..67a474c81 100644
--- a/doc/libempathy-gtk/tmpl/empathy-account-chooser.sgml
+++ b/doc/libempathy-gtk/tmpl/empathy-account-chooser.sgml
@@ -22,7 +22,11 @@ EmpathyAccountChooser
 
 </para>
 
-@parent: 
+
+<!-- ##### ARG EmpathyAccountChooser:has-all-option ##### -->
+<para>
+
+</para>
 
 <!-- ##### FUNCTION empathy_account_chooser_new ##### -->
 <para>
diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index 4313bc2cf..e234ec521 100644
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -24,6 +24,7 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <glib/gstdio.h>
 
 #include "empathy-log-manager.h"
@@ -142,6 +143,7 @@ empathy_log_manager_add_message (EmpathyLogManager *manager,
 	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 +152,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;
@@ -190,11 +193,12 @@ empathy_log_manager_add_message (EmpathyLogManager *manager,
 	contact_id = g_markup_escape_text (str, -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' isuser='%s' type='%s'>%s</message>\n" LOG_FOOTER,
 		   timestamp,
 		   contact_id,
 		   contact_name,
 		   empathy_contact_is_user (sender) ? "true" : "false",
+		   empathy_message_type_to_str (msg_type),
 		   body);
 
 	fclose (file);
@@ -318,15 +322,17 @@ 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;
+		gchar              *time;
+		EmpathyTime         t;
+		gchar              *sender_id;
+		gchar              *sender_name;
+		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;
@@ -337,10 +343,14 @@ empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager,
 		sender_id = xmlGetProp (node, "id");
 		sender_name = xmlGetProp (node, "name");
 		is_user_str = xmlGetProp (node, "isuser");
+		msg_type_str = xmlGetProp (node, "type");
 
 		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);
 
@@ -349,6 +359,7 @@ empathy_log_manager_get_messages_for_file (EmpathyLogManager *manager,
 		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 +368,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));
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 8b4751ee2..0ff2567bf 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -31,12 +31,11 @@
 typedef struct _EmpathyMessagePriv EmpathyMessagePriv;
 
 struct _EmpathyMessagePriv {
-	EmpathyMessageType     type;
-	EmpathyContact        *sender;
-	EmpathyContact        *receiver;
-	gchar                *body;
-	EmpathyTime            timestamp;
-
+	EmpathyMessageType  type;
+	EmpathyContact     *sender;
+	EmpathyContact     *receiver;
+	gchar              *body;
+	EmpathyTime         timestamp;
 };
 
 static void empathy_message_class_init (EmpathyMessageClass *class);
@@ -416,3 +415,37 @@ empathy_message_set_timestamp (EmpathyMessage *message,
 	g_object_notify (G_OBJECT (message), "timestamp");
 }
 
+EmpathyMessageType
+empathy_message_type_from_str (const gchar *type_str)
+{
+	if (strcmp (type_str, "normal") == 0) {
+		return EMPATHY_MESSAGE_TYPE_NORMAL;
+	}
+	if (strcmp (type_str, "action") == 0) {
+		return EMPATHY_MESSAGE_TYPE_ACTION;
+	}
+	else if (strcmp (type_str, "notice") == 0) {
+		return EMPATHY_MESSAGE_TYPE_NOTICE;
+	}
+	else if (strcmp (type_str, "auto-reply") == 0) {
+		return EMPATHY_MESSAGE_TYPE_AUTO_REPLY;
+	}
+
+	return EMPATHY_MESSAGE_TYPE_NORMAL;
+}
+
+const gchar *
+empathy_message_type_to_str (EmpathyMessageType type)
+{
+	switch (type) {
+	case EMPATHY_MESSAGE_TYPE_ACTION:
+		return "action";
+	case EMPATHY_MESSAGE_TYPE_NOTICE:
+		return "notice";
+	case EMPATHY_MESSAGE_TYPE_AUTO_REPLY:
+		return "auto-reply";
+	default:
+		return "normal";
+	}
+}
+
diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index ba6f4c426..5baddd6bb 100644
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -58,24 +58,25 @@ typedef enum {
 	EMPATHY_MESSAGE_TYPE_LAST
 } EmpathyMessageType;
 
-GType             empathy_message_get_gtype               (void) G_GNUC_CONST;
-EmpathyMessage *   empathy_message_new                     (const gchar          *body);
-EmpathyMessageType empathy_message_get_type                (EmpathyMessage        *message);
-void              empathy_message_set_type                (EmpathyMessage        *message,
-							  EmpathyMessageType     type);
-EmpathyContact *   empathy_message_get_sender              (EmpathyMessage        *message);
-void              empathy_message_set_sender              (EmpathyMessage        *message,
-							  EmpathyContact        *contact);
-EmpathyContact *   empathy_message_get_receiver            (EmpathyMessage        *message);
-void              empathy_message_set_receiver            (EmpathyMessage        *message,
-							  EmpathyContact        *contact);
-const gchar *     empathy_message_get_body                (EmpathyMessage        *message);
-void              empathy_message_set_body                (EmpathyMessage        *message,
-							  const gchar          *body);
-/* What return value should we have here? */
-EmpathyTime        empathy_message_get_timestamp           (EmpathyMessage        *message);
-void              empathy_message_set_timestamp           (EmpathyMessage        *message,
-							  EmpathyTime            timestamp);
+GType              empathy_message_get_gtype     (void) G_GNUC_CONST;
+EmpathyMessage *   empathy_message_new           (const gchar        *body);
+EmpathyMessageType empathy_message_get_type      (EmpathyMessage     *message);
+void               empathy_message_set_type      (EmpathyMessage     *message,
+						  EmpathyMessageType  type);
+EmpathyContact *   empathy_message_get_sender    (EmpathyMessage     *message);
+void               empathy_message_set_sender    (EmpathyMessage     *message,
+						  EmpathyContact     *contact);
+EmpathyContact *   empathy_message_get_receiver  (EmpathyMessage     *message);
+void               empathy_message_set_receiver  (EmpathyMessage     *message,
+						  EmpathyContact     *contact);
+const gchar *      empathy_message_get_body      (EmpathyMessage     *message);
+void               empathy_message_set_body      (EmpathyMessage     *message,
+						  const gchar        *body);
+EmpathyTime        empathy_message_get_timestamp (EmpathyMessage     *message);
+void               empathy_message_set_timestamp (EmpathyMessage     *message,
+						  EmpathyTime         timestamp);
+EmpathyMessageType empathy_message_type_from_str (const gchar        *type_str);
+const gchar *      empathy_message_type_to_str   (EmpathyMessageType  type);
 
 G_END_DECLS