/cpw/tomkiewicz/gg11: d2e4e92b3157: Merge from trunk

[Tomasz Wasilczyk]

Changeset: d2e4e92b3157ae7b5f077b961503b2199ef20d3c
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-09-19 13:18 +0200
Branch:	 default
URL: http://hg.pidgin.im/cpw/tomkiewicz/gg11/rev/d2e4e92b3157

Description:

Merge from trunk

diffstat:

 pidgin/gtkwebviewtoolbar.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (14 lines):

diff --git a/pidgin/gtkwebviewtoolbar.c b/pidgin/gtkwebviewtoolbar.c
--- a/pidgin/gtkwebviewtoolbar.c
+++ b/pidgin/gtkwebviewtoolbar.c
@@ -594,7 +594,9 @@ do_insert_image_cb(GtkWidget *widget, in
 	g_free(filename);
 
 	gtk_webview_insert_image(GTK_WEBVIEW(toolbar->webview), id);
-	purple_imgstore_unref_by_id(id);
+	/* TODO: do it after passing an image to prpl, not before
+	 * purple_imgstore_unref_by_id(id);
+	 */
 }
 
 static void