[empathy] Fallback if ContentNext or Outgoing are missing.



commit c701544eca086e1d87f8f3539580a37c6fcd3931
Author: Xavier Claessens <xclaesse gmail com>
Date:   Wed Jul 16 20:26:03 2008 +0200

    Fallback if ContentNext or Outgoing are missing.

 libempathy-gtk/empathy-theme-adium.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 9b26adf..0865301 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -214,7 +214,7 @@ theme_adium_append_message (EmpathyChatView *view,
 	time_t                 timestamp;
 	gsize                  len;
 	GString               *string;
-	gchar                 *cur;
+	gchar                 *cur = NULL;
 	gchar                 *prev;
 	gchar                 *script;
 	gchar                 *escape;
@@ -246,16 +246,19 @@ theme_adium_append_message (EmpathyChatView *view,
 		if (empathy_contact_is_user (sender)) {
 			cur = priv->out_nextcontent_html;
 			len = priv->out_nextcontent_len;
-		} else {
+		}
+		if (!cur) {
 			cur = priv->in_nextcontent_html;
 			len = priv->in_nextcontent_len;
 		}
-	} else {
+	}
+	if (!cur) {
 		func = "appendMessage";
 		if (empathy_contact_is_user (sender)) {
 			cur = priv->out_content_html;
 			len = priv->out_content_len;
-		} else {
+		}
+		if (!cur) {
 			cur = priv->in_content_html;
 			len = priv->in_content_len;
 		}



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]