diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2008-07-17 02:26:03 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-06-12 00:06:28 +0800 |
| commit | c701544eca086e1d87f8f3539580a37c6fcd3931 (patch) | |
| tree | 4dd62ce6fdb860e9a7f26df468c84981efb9809f /libempathy-gtk/empathy-theme-adium.c | |
| parent | 0dfbea70e24e4fecde1d347ae5bb1ac2c864e37e (diff) | |
| download | gsoc2013-empathy-c701544eca086e1d87f8f3539580a37c6fcd3931.tar gsoc2013-empathy-c701544eca086e1d87f8f3539580a37c6fcd3931.tar.gz gsoc2013-empathy-c701544eca086e1d87f8f3539580a37c6fcd3931.tar.bz2 gsoc2013-empathy-c701544eca086e1d87f8f3539580a37c6fcd3931.tar.lz gsoc2013-empathy-c701544eca086e1d87f8f3539580a37c6fcd3931.tar.xz gsoc2013-empathy-c701544eca086e1d87f8f3539580a37c6fcd3931.tar.zst gsoc2013-empathy-c701544eca086e1d87f8f3539580a37c6fcd3931.zip | |
Fallback if ContentNext or Outgoing are missing.
Diffstat (limited to 'libempathy-gtk/empathy-theme-adium.c')
| -rw-r--r-- | 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 9b26adf5e..0865301ba 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; } |