[empathy/next: 20/21] Merge remote-tracking branch 'origin/master' into next

[Simon McVittie <smcv src gnome org>]

commit 800728d40f20ed98747324007d6a8b3f31b2485d
Merge: 4c6dc7d 49a243c
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Wed May 14 11:43:19 2014 +0100

    Merge remote-tracking branch 'origin/master' into next
    
    Conflicts:
        configure.ac
        libempathy-gtk/empathy-chat.c

 NEWS                          |   23 +
 configure.ac                  |    2 +-
 empathy.doap                  |    5 +-
 help/es/es.po                 | 1786 ++++++++-----
 libempathy-gtk/empathy-chat.c |   37 +-
 po/be.po                      |  590 ++---
 po/ca valencia po             |  644 +++---
 po/de.po                      |  584 ++---
 po/es.po                      |   14 +-
 po/id.po                      |  483 ++--
 po/ro.po                      | 5814 ++++++++++++++++++++---------------------
 po/ru.po                      |   67 +-
 release.py                    |    2 +-
 13 files changed, 5172 insertions(+), 4879 deletions(-)
---
diff --cc configure.ac
index 2cb164f,093abcf..c393396
--- a/configure.ac
+++ b/configure.ac
@@@ -3,8 -3,8 +3,8 @@@ m4_define(empathy_released, 0
  
  m4_define([empathy_major_version], [3])
  m4_define([empathy_minor_version], [12])
- m4_define([empathy_micro_version], [0])
+ m4_define([empathy_micro_version], [2])
 -m4_define([empathy_nano_version], [0])
 +m4_define([empathy_nano_version], [1])
  
  dnl Display the nano_version only if it's not '0'
  m4_define([empathy_base_version],
diff --cc libempathy-gtk/empathy-chat.c
index f6d58e7,fc35bec..246e3a7
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@@ -3451,25 -3439,24 +3437,24 @@@ chat_constructed (GObject *object
                                                    supports_avatars);
        }
  
-       /* Add messages from last conversation */
+       /* Add messages from last conversations. Backlog messages are always
+        * prepended and pending messages are appended, so we can do both
+        * independently. Hacks like we previously had for bug #603980 are no
+        * longer needed. Pending messages are handled within
+        * empathy_chat_set_tp_chat() so we don't have to care about them here.
+        */
 -      if (priv->handle_type == TP_HANDLE_TYPE_ROOM)
 +      if (priv->entity_type == TP_ENTITY_TYPE_ROOM)
                target = tpl_entity_new_from_room_id (priv->id);
        else
 -              target = tpl_entity_new (priv->id, TPL_ENTITY_CONTACT, NULL, NULL);
 +              target = tpl_entity_new (priv->id, TP_ENTITY_TYPE_CONTACT, NULL, NULL);
  
        priv->log_walker = tpl_log_manager_walk_filtered_events (priv->log_manager, priv->account, target,
                                                                 TPL_EVENT_MASK_TEXT, chat_log_filter, chat);
        g_object_unref (target);
  
 -      if (priv->handle_type != TP_HANDLE_TYPE_ROOM) {
 +      if (priv->entity_type != TP_ENTITY_TYPE_ROOM) {
-               /* First display logs from the logger and then display pending messages */
                chat_add_logs (chat);
        }
-        else {
-               /* Just display pending messages for rooms */
-               priv->can_show_pending = TRUE;
-               show_pending_messages (chat);
-       }
  }
  
  static void