From c701544eca086e1d87f8f3539580a37c6fcd3931 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 16 Jul 2008 20:26:03 +0200 Subject: [PATCH] Fallback if ContentNext or Outgoing are missing. --- libempathy-gtk/empathy-theme-adium.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 9b26adf5..0865301b 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; } -- 2.39.2