/pidgin/main: 4f41f47a9482: Merge. One easy conflict in gtkimhtml.

[Mark Doliner]

Changeset: 4f41f47a9482be980b2cd71bfd5709a8f16536cb
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2013-03-03 20:01 -0800
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/4f41f47a9482

Description:

Merge.  One easy conflict in gtkimhtml.

diffstat:

 pidgin/gtkimhtml.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
@@ -5244,7 +5244,7 @@ void gtk_imhtml_insert_image_at_iter(Gtk
 
 static const gchar *tag_to_html_start(GtkTextTag *tag)
 {
-	static gchar buf[1024];
+	static gchar buf[16384];
 	gchar *name = NULL;
 
 	g_object_get(G_OBJECT(tag), "name", &name, NULL);