diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2009-09-28 15:52:41 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2009-09-30 22:16:57 +0800 |
| commit | 1d51095fdf7beea98a0a89c89d19b1dd1efec927 (patch) | |
| tree | fdd65b333c4501a1d8ec3f1caf779935b4dbf4f3 /libempathy-gtk/empathy-theme-adium.c | |
| parent | 942b989926d9a4ebecafc1ecd0586be19ee4aeda (diff) | |
| download | gsoc2013-empathy-1d51095fdf7beea98a0a89c89d19b1dd1efec927.tar gsoc2013-empathy-1d51095fdf7beea98a0a89c89d19b1dd1efec927.tar.gz gsoc2013-empathy-1d51095fdf7beea98a0a89c89d19b1dd1efec927.tar.bz2 gsoc2013-empathy-1d51095fdf7beea98a0a89c89d19b1dd1efec927.tar.lz gsoc2013-empathy-1d51095fdf7beea98a0a89c89d19b1dd1efec927.tar.xz gsoc2013-empathy-1d51095fdf7beea98a0a89c89d19b1dd1efec927.tar.zst gsoc2013-empathy-1d51095fdf7beea98a0a89c89d19b1dd1efec927.zip | |
Respect "DisableCombineConsecutive" adium theme setting. Fixes bug #596317
Diffstat (limited to 'libempathy-gtk/empathy-theme-adium.c')
| -rw-r--r-- | libempathy-gtk/empathy-theme-adium.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index f4779da67..edb0186e3 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -603,12 +603,15 @@ theme_adium_append_message (EmpathyChatView *view, /* We want to join this message with the last one if * - senders are the same contact, - * - last message was recieved recently, and - * - last message and this message both are/aren't backlog */ + * - last message was recieved recently, + * - last message and this message both are/aren't backlog, and + * - DisableCombineConsecutive is not set in theme's settings */ is_backlog = empathy_message_is_backlog (msg); consecutive = empathy_contact_equal (priv->last_contact, sender) && (timestamp - priv->last_timestamp < MESSAGE_JOIN_PERIOD) && - (is_backlog == priv->last_is_backlog); + (is_backlog == priv->last_is_backlog) && + !tp_asv_get_boolean (priv->data->info, + "DisableCombineConsecutive", NULL); /* Define message classes */ message_classes = g_string_new ("message"); |