aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-theme-adium.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 9e3c41527..2b2504ffd 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -306,12 +306,6 @@ theme_adium_parse_body (EmpathyThemeAdium *theme,
return ret;
}
-static void
-theme_adium_scroll_down (EmpathyChatView *view)
-{
- /* Not implemented */
-}
-
#define FOLLOW(cur, str) (!strncmp (cur, str, strlen (str)))
static void
theme_adium_append_message (EmpathyChatView *view,
@@ -362,6 +356,7 @@ theme_adium_append_message (EmpathyChatView *view,
avatar_filename = priv->default_avatar_filename;
}
+ /* FIXME: What if the message is an action "/me foo"? */
/* Get the right html/func to add the message */
if (priv->last_contact &&
empathy_contact_equal (priv->last_contact, sender)) {
@@ -406,15 +401,18 @@ theme_adium_append_message (EmpathyChatView *view,
gchar *start;
gchar *end;
- /* Extract the time format it provided. */
+ /* Extract the time format if provided. */
if (*(start = cur + strlen("%time")) == '{') {
start++;
end = strstr (start, "}%");
- if (!end) /* Invalid string */
+ if (!end) {
+ /* Invalid string */
+ cur++;
continue;
+ }
format = g_strndup (start, end - start);
fin = end + 1;
- }
+ }
dup_replace = empathy_time_to_string_local (timestamp,
format ? format : EMPATHY_TIME_FORMAT_DISPLAY_SHORT);
@@ -471,6 +469,12 @@ theme_adium_scroll (EmpathyChatView *view,
/* Not implemented */
}
+static void
+theme_adium_scroll_down (EmpathyChatView *view)
+{
+ /* Not implemented */
+}
+
static gboolean
theme_adium_get_has_selection (EmpathyChatView *view)
{