Fallback if ContentNext or Outgoing are missing.

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 9b26adf5e087055b64f12cda2e7299e626b0bbbc..0865301ba449d9426e735f8e09cf5e22792fd798 100644 (file)
--- 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;
                }