diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2009-09-30 15:40:16 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-09-30 22:16:57 +0800 |
| commit | d038bcbb47ea96e4c128f85f64897d557ea380b9 (patch) | |
| tree | 453d885305ee9601a94a67636b68fe78277c9301 | |
| parent | 1d51095fdf7beea98a0a89c89d19b1dd1efec927 (diff) | |
| download | gsoc2013-empathy-d038bcbb47ea96e4c128f85f64897d557ea380b9.tar gsoc2013-empathy-d038bcbb47ea96e4c128f85f64897d557ea380b9.tar.gz gsoc2013-empathy-d038bcbb47ea96e4c128f85f64897d557ea380b9.tar.bz2 gsoc2013-empathy-d038bcbb47ea96e4c128f85f64897d557ea380b9.tar.lz gsoc2013-empathy-d038bcbb47ea96e4c128f85f64897d557ea380b9.tar.xz gsoc2013-empathy-d038bcbb47ea96e4c128f85f64897d557ea380b9.tar.zst gsoc2013-empathy-d038bcbb47ea96e4c128f85f64897d557ea380b9.zip | |
Even if Next*.html are missing, we have to use the appendNextMessage js function for consecutive message.
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index edb0186e3..a860754c9 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -627,16 +627,22 @@ theme_adium_append_message (EmpathyChatView *view, g_string_append (message_classes, " incoming"); } + /* Define javascript function to use */ + if (consecutive) { + func = "appendNextMessage"; + } else { + func = "appendMessage"; + } + /* Outgoing */ if (empathy_contact_is_user (sender)) { if (consecutive) { - func = "appendNextMessage"; if (is_backlog) { html = priv->data->out_nextcontext_html; len = priv->data->out_nextcontext_len; } - /* Note backlog, or fallback if NextContext.html + /* Not backlog, or fallback if NextContext.html * is missing */ if (html == NULL) { html = priv->data->out_nextcontent_html; @@ -647,7 +653,6 @@ theme_adium_append_message (EmpathyChatView *view, /* Not consecutive, or fallback if NextContext.html and/or * NextContent.html are missing */ if (html == NULL) { - func = "appendMessage"; if (is_backlog) { html = priv->data->out_context_html; len = priv->data->out_context_len; @@ -663,7 +668,6 @@ theme_adium_append_message (EmpathyChatView *view, /* Incoming, or fallback if outgoing files are missing */ if (html == NULL) { if (consecutive) { - func = "appendNextMessage"; if (is_backlog) { html = priv->data->in_nextcontext_html; len = priv->data->in_nextcontext_len; @@ -680,7 +684,6 @@ theme_adium_append_message (EmpathyChatView *view, /* Not consecutive, or fallback if NextContext.html and/or * NextContent.html are missing */ if (html == NULL) { - func = "appendMessage"; if (is_backlog) { html = priv->data->in_context_html; len = priv->data->in_context_len; |