/cpw/tomkiewicz/masterpassword: a56f2737937f: Merge from default

[Tomasz Wasilczyk]

Changeset: a56f2737937f75f1a89e916880f549df32589999
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-03-21 01:24 +0100
Branch:	 soc.2008.masterpassword
URL: https://hg.pidgin.im/cpw/tomkiewicz/masterpassword/rev/a56f2737937f

Description:

Merge from default

diffstat:

 libpurple/protocols/gg/resolver-purple.c |  4 ++++
 libpurple/util.c                         |  1 +
 pidgin/gtkblist.c                        |  9 ++++++++-
 pidgin/gtkstatusbox.c                    |  2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)

diffs (82 lines):

diff --git a/libpurple/protocols/gg/resolver-purple.c b/libpurple/protocols/gg/resolver-purple.c
--- a/libpurple/protocols/gg/resolver-purple.c
+++ b/libpurple/protocols/gg/resolver-purple.c
@@ -75,6 +75,8 @@ void ggp_resolver_purple_cb(GSList *host
 	purple_debug_misc("gg", "ggp_resolver_purple_cb(%p, %p, \"%s\")\n",
 		hosts, cbdata, error_message);
 	
+	data->purpleQuery = NULL;
+	
 	if (error_message)
 	{
 		purple_debug_error("gg", "ggp_resolver_purple_cb failed: %s\n",
@@ -183,6 +185,8 @@ void ggp_resolver_purple_cleanup(void **
 		return;
 	*private_data = NULL;
 	
+	if (data->purpleQuery)
+		purple_dnsquery_destroy(data->purpleQuery);
 	if (data->pipes[0])
 		close(data->pipes[0]);
 	if (data->pipes[1])
diff --git a/libpurple/util.c b/libpurple/util.c
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -130,6 +130,7 @@ purple_util_init(void)
 {
 	escape_js_node = json_node_new(JSON_NODE_VALUE);
 	escape_js_gen = json_generator_new();
+	json_node_set_boolean(escape_js_node, FALSE);
 }
 
 void
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -123,6 +123,8 @@ typedef struct
 
 	PidginBlistTheme *current_theme;
 
+	guint select_notebook_page_timeout;
+
 #if !GTK_CHECK_VERSION(3,0,0)
 	GdkCursor *hand_cursor;         /**< Hand cursor */
 	GdkCursor *arrow_cursor;        /**< Arrow cursor */
@@ -5033,12 +5035,15 @@ static gboolean pidgin_blist_select_note
 	} else
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(gtkblist->notebook), 0);
 
+	priv->select_notebook_page_timeout = 0;
 	return FALSE;
 }
 
 static void pidgin_blist_select_notebook_page(PidginBuddyList *gtkblist)
 {
-	purple_timeout_add(0, pidgin_blist_select_notebook_page_cb, gtkblist);
+	PidginBuddyListPrivate *priv = PIDGIN_BUDDY_LIST_GET_PRIVATE(gtkblist);
+	priv->select_notebook_page_timeout = purple_timeout_add(0,
+		pidgin_blist_select_notebook_page_cb, gtkblist);
 }
 
 static void account_modified(PurpleAccount *account, PidginBuddyList *gtkblist)
@@ -7132,6 +7137,8 @@ static void pidgin_blist_destroy(PurpleB
 
 	if (priv->current_theme)
 		g_object_unref(priv->current_theme);
+	if (priv->select_notebook_page_timeout)
+		purple_timeout_remove(priv->select_notebook_page_timeout);
 	g_free(priv);
 
 	g_free(gtkblist);
diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
@@ -2860,7 +2860,7 @@ webview_format_changed_cb(GtkWebView *we
 char *pidgin_status_box_get_message(PidginStatusBox *status_box)
 {
 	if (status_box->webview_visible)
-		return gtk_webview_get_body_html(GTK_WEBVIEW(status_box->webview));
+		return g_strstrip(gtk_webview_get_body_text(GTK_WEBVIEW(status_box->webview)));
 	else
 		return NULL;
 }