/dev/tomkiewicz/new-smileys: b22f83f11582: Remote smileys: fix c...

[Tomasz Wasilczyk]

Changeset: b22f83f1158241734905ddb90c9705c8c611d90e
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-04 20:34 +0200
Branch:	 default
URL: https://hg.pidgin.im/dev/tomkiewicz/new-smileys/rev/b22f83f11582

Description:

Remote smileys: fix comments

diffstat:

 pidgin/gtkconv.c            |  5 -----
 pidgin/themes/Template.html |  9 +++++++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (34 lines):

diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -6658,11 +6658,6 @@ pidgin_conv_write_smiley(GString *out, P
 			pidgin_smiley_get_unique_id(smiley), escaped_shortcut);
 		g_signal_connect_object(smiley, "ready",
 			G_CALLBACK(pidgin_conv_remote_smiley_got), conv, 0);
-
-		/* TODO: watch for "is-ready" state changes
-		 * (it's not possible without conv handle here) */
-		/* XXX: avoid race condition between is-ready
-		 * call and html being pasted */
 	}
 
 	g_free(escaped_shortcut);
diff --git a/pidgin/themes/Template.html b/pidgin/themes/Template.html
--- a/pidgin/themes/Template.html
+++ b/pidgin/themes/Template.html
@@ -248,6 +248,15 @@
 			var shouldScroll = nearBottom();
 			var emoticons;
 
+			/* There is a possible race condition: if we call this
+			 * before the span.emoticon.pending is added, the latter
+			 * won't be converted.
+			 *
+			 * We could avoid this, by calling it again using
+			 * setTimeout, but it may affect performance. So, we
+			 * won't do it until anyone complains.
+			 */
+
 			emoticons = document.getElementsByClassName('emoticon-id-' + emoticonId);
 			for (var i = 0; i < emoticons.length; i++) {
 				var node = emoticons[i];