...
 
Commits (15)
......@@ -129,9 +129,6 @@ struct _EmpathyChatPriv {
guint unread_messages;
guint unread_messages_when_offline;
/* TRUE if the pending messages can be displayed. This is to avoid to show
* pending messages *before* messages from logs. (#603980) */
gboolean can_show_pending;
/* FIXME: retrieving_backlogs flag is a workaround for Bug#610994 and should
* be differently handled since it introduces another race condition, which
......@@ -2523,19 +2520,14 @@ out:
return retval;
}
static void
show_pending_messages (EmpathyChat *chat) {
EmpathyChatPriv *priv = GET_PRIV (chat);
const GList *messages, *l;
g_return_if_fail (EMPATHY_IS_CHAT (chat));
if (chat->view == NULL || priv->tp_chat == NULL)
return;
if (!priv->can_show_pending)
return;
g_return_if_fail (chat->view != NULL);
g_return_if_fail (priv->tp_chat != NULL);
messages = empathy_tp_chat_get_pending_messages (priv->tp_chat);
......@@ -2545,7 +2537,6 @@ show_pending_messages (EmpathyChat *chat) {
}
}
static gboolean
chat_scrollable_set_value (gpointer user_data)
{
......@@ -2643,11 +2634,6 @@ out:
*/
if (G_UNLIKELY (!priv->watch_scroll &&
!tpl_log_walker_is_end (priv->log_walker))) {
/* The pending messages need not be shown after the
* first batch of logs have been displayed */
priv->can_show_pending = TRUE;
show_pending_messages (chat);
priv->watch_scroll = TRUE;
g_idle_add_full (G_PRIORITY_LOW, chat_scrollable_connect,
g_object_ref (chat), g_object_unref);
......@@ -3458,7 +3444,12 @@ 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)
target = tpl_entity_new_from_room_id (priv->id);
else
......@@ -3469,14 +3460,8 @@ chat_constructed (GObject *object)
g_object_unref (target);
if (priv->handle_type != TP_HANDLE_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
......@@ -3682,6 +3667,9 @@ empathy_chat_init (EmpathyChat *chat)
priv->completion = g_completion_new ((GCompletionFunc) empathy_contact_get_alias);
g_completion_set_compare (priv->completion, chat_contacts_completion_func);
/* Create UI early so by the time empathy_chat_set_tp_chat() is called
* (construct property) the view will already exists to receive pending
* messages. */
chat_create_ui (chat);
}
......@@ -4197,9 +4185,6 @@ empathy_chat_set_tp_chat (EmpathyChat *chat,
g_object_notify (G_OBJECT (chat), "id");
g_object_notify (G_OBJECT (chat), "account");
/* This is a noop when tp-chat is set at object construction time and causes
* the pending messages to be show when it's set on the object after it has
* been created */
show_pending_messages (chat);
/* check if a password is needed */
......
This diff is collapsed.
This diff is collapsed.
......@@ -2,7 +2,7 @@
# Copyright (C) 2003 Free Software Foundation
# This file is distributed under the same license as the Gossip package.
# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013.
# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012, 2013, 2014.
#
msgid ""
msgstr ""
......@@ -10,15 +10,15 @@ msgstr ""
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
"POT-Creation-Date: 2013-11-20 07:59+0000\n"
"PO-Revision-Date: 2013-11-20 13:14+0100\n"
"PO-Revision-Date: 2014-05-08 20:58+0200\n"
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
"Language-Team: Español <gnome-es-list@gnome.org>\n"
"Language-Team: Español; Castellano <gnome-es-list@gnome.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Gtranslator 2.91.5\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"X-Generator: Gtranslator 2.91.6\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/empathy.desktop.in.in.h:1
msgid "Empathy"
......@@ -124,7 +124,7 @@ msgstr ""
#: ../data/org.gnome.Empathy.gschema.xml.h:12
#: ../src/empathy-preferences.ui.h:1
msgid "Show offline contacts"
msgstr "Mostrar contactos no conectados"
msgstr "Mostrar contactos desconectados"
#: ../data/org.gnome.Empathy.gschema.xml.h:13
msgid "Whether to show contacts that are offline in the contact list."
......@@ -398,8 +398,8 @@ msgid ""
"Whether to send the 'composing' or 'paused' chat states. Does not currently "
"affect the 'gone' state."
msgstr ""
"Indica si enviar los estados de chat «escribiendo» o «en pausa». No afecta al "
"estado «ausente»."
"Indica si enviar los estados de chat «escribiendo» o «en pausa». No afecta "
"al estado «ausente»."
#: ../data/org.gnome.Empathy.gschema.xml.h:70
msgid "Use theme for chat rooms"
......@@ -856,8 +856,8 @@ msgid ""
"join a new chat room\""
msgstr ""
"/say <mensaje>: enviar un <mensaje> a la conversación actual. Esto se usa "
"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa "
"para unirse a una sala de chat nueva»"
"para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se "
"usa para unirse a una sala de chat nueva»"
#: ../libempathy-gtk/empathy-chat.c:1095
msgid "/whois <contact ID>: display information about a contact"
......@@ -3642,7 +3642,7 @@ msgstr "Todavía no ha añadido ningún contacto"
#: ../src/empathy-roster-window.c:1732
msgid "No online contacts"
msgstr "No hay contactos no conectados"
msgstr "No hay contactos conectados"
#: ../src/empathy-roster-window-menubar.ui.h:1
#: ../src/empathy-status-icon.ui.h:2
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -59,7 +59,7 @@ msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务"
msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
msgstr ""
"chat;talk;im;message;irc;voip;gtalk;facebook;jabber;聊天;消息;即时通讯;通话;"
"视频"
"视频;"
#: ../data/empathy.appdata.xml.in.h:1
msgid ""
......