# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1316742960 0
# Node ID fe64a59f3b7303df085e4c03c2c771392bd28622
# Parent  305fc585032136b86cab502189375873df4bc2c5# Parent  1223abf2eaf2c4812ae8dba710c932c1a4d65572
merge of '64f210128f2360d48b91e7008fe5004b5963d425'
     and 'ea348fd63df8138afe8b803f9e352a9273ae7234'

diff -r 305fc5850321 -r fe64a59f3b73 pidgin/gtkconv-theme.c
--- a/pidgin/gtkconv-theme.c	Thu Sep 22 07:09:39 2011 +0000
+++ b/pidgin/gtkconv-theme.c	Fri Sep 23 01:56:00 2011 +0000
@@ -310,7 +310,7 @@
 
 	file = g_build_filename(dir, "Contents", "Resources", "Topic.html", NULL);
 	if (!g_file_get_contents(file, &priv->topic_html, NULL, NULL)) {
-		purple_debug_info("webkit", "%s could not find Resources/Topic.html", dir);
+		purple_debug_info("webkit", "%s could not find Resources/Topic.html\n", dir);
 		priv->topic_html = g_strdup("");
 	}
 	g_free(file);
@@ -328,7 +328,7 @@
 
 	file = g_build_filename(dir, "Contents", "Resources", "Status.html", NULL);
 	if (!g_file_get_contents(file, &priv->status_html, NULL, NULL)) {
-		purple_debug_info("webkit", "%s could not find Resources/Status.html", dir);
+		purple_debug_info("webkit", "%s could not find Resources/Status.html\n", dir);
 		priv->status_html = g_strdup("");
 	}
 	g_free(file);
diff -r 305fc5850321 -r fe64a59f3b73 pidgin/plugins/Makefile.am
--- a/pidgin/plugins/Makefile.am	Thu Sep 22 07:09:39 2011 +0000
+++ b/pidgin/plugins/Makefile.am	Fri Sep 23 01:56:00 2011 +0000
@@ -16,6 +16,9 @@
 PERL_DIR = perl
 endif
 
+if ENABLE_GESTURES
+GESTURE_DIR = gestures
+endif
 
 SUBDIRS = \
 	$(CAP_DIR) \
diff -r 305fc5850321 -r fe64a59f3b73 pidgin/plugins/gestures/gestures.c
--- a/pidgin/plugins/gestures/gestures.c	Thu Sep 22 07:09:39 2011 +0000
+++ b/pidgin/plugins/gestures/gestures.c	Fri Sep 23 01:56:00 2011 +0000
@@ -48,7 +48,7 @@
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
 
-	gstroke_cleanup(gtkconv->imhtml);
+	gstroke_cleanup(gtkconv->webview);
 	purple_conversation_destroy(conv);
 }
 
@@ -126,15 +126,15 @@
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
 
-	gstroke_enable(gtkconv->imhtml);
-	gstroke_signal_connect(gtkconv->imhtml, "14789",  stroke_close,    conv);
-	gstroke_signal_connect(gtkconv->imhtml, "1456",   stroke_close,    conv);
-	gstroke_signal_connect(gtkconv->imhtml, "1489",   stroke_close,    conv);
-	gstroke_signal_connect(gtkconv->imhtml, "74123",  stroke_next_tab, conv);
-	gstroke_signal_connect(gtkconv->imhtml, "7456",   stroke_next_tab, conv);
-	gstroke_signal_connect(gtkconv->imhtml, "96321",  stroke_prev_tab, conv);
-	gstroke_signal_connect(gtkconv->imhtml, "9654",   stroke_prev_tab, conv);
-	gstroke_signal_connect(gtkconv->imhtml, "25852",  stroke_new_win,  conv);
+	gstroke_enable(gtkconv->webview);
+	gstroke_signal_connect(gtkconv->webview, "14789",  stroke_close,    conv);
+	gstroke_signal_connect(gtkconv->webview, "1456",   stroke_close,    conv);
+	gstroke_signal_connect(gtkconv->webview, "1489",   stroke_close,    conv);
+	gstroke_signal_connect(gtkconv->webview, "74123",  stroke_next_tab, conv);
+	gstroke_signal_connect(gtkconv->webview, "7456",   stroke_next_tab, conv);
+	gstroke_signal_connect(gtkconv->webview, "96321",  stroke_prev_tab, conv);
+	gstroke_signal_connect(gtkconv->webview, "9654",   stroke_prev_tab, conv);
+	gstroke_signal_connect(gtkconv->webview, "25852",  stroke_new_win,  conv);
 }
 
 static void
@@ -215,8 +215,8 @@
 
 		gtkconv = PIDGIN_CONVERSATION(conv);
 
-		gstroke_cleanup(gtkconv->imhtml);
-		gstroke_disable(gtkconv->imhtml);
+		gstroke_cleanup(gtkconv->webview);
+		gstroke_disable(gtkconv->webview);
 	}
 
 	return TRUE;