pidgin: ea348fd6: Fix the gestures plugin, which really on...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: ea348fd63df8138afe8b803f9e352a9273ae7234
Parent:   6c1f5ff1471b4ba563883fe95b8815f9c1c5b5e4
Author:   qulogic at pidgin.im
Date:     09/22/11 20:05:48
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ea348fd63df8138afe8b803f9e352a9273ae7234

Changelog: 

Fix the gestures plugin, which really only needed a widget from
which events could be obtained. It had no GtkIMHtml-specific code.

Changes against parent 6c1f5ff1471b4ba563883fe95b8815f9c1c5b5e4

  patched  pidgin/plugins/Makefile.am
  patched  pidgin/plugins/gestures/gestures.c

-------------- next part --------------
============================================================
--- pidgin/plugins/gestures/gestures.c	c16ac78591c42117a071097e73e63e7d9e65506b
+++ pidgin/plugins/gestures/gestures.c	c67dccef48e662b2b7f008f47824c4cbb4c0d060
@@ -48,7 +48,7 @@ stroke_close(GtkWidget *widget, void *da
 
 	gtkconv = PIDGIN_CONVERSATION(conv);
 
-	gstroke_cleanup(gtkconv->imhtml);
+	gstroke_cleanup(gtkconv->webview);
 	purple_conversation_destroy(conv);
 }
 
@@ -126,15 +126,15 @@ attach_signals(PurpleConversation *conv)
 
 	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 @@ plugin_unload(PurplePlugin *plugin)
 
 		gtkconv = PIDGIN_CONVERSATION(conv);
 
-		gstroke_cleanup(gtkconv->imhtml);
-		gstroke_disable(gtkconv->imhtml);
+		gstroke_cleanup(gtkconv->webview);
+		gstroke_disable(gtkconv->webview);
 	}
 
 	return TRUE;
============================================================
--- pidgin/plugins/Makefile.am	a2eb4b97dd42747393d29b85283d07b4863dfcf3
+++ pidgin/plugins/Makefile.am	831c70cf584430af557af8b68dbb5588914142d4
@@ -16,6 +16,9 @@ endif
 PERL_DIR = perl
 endif
 
+if ENABLE_GESTURES
+GESTURE_DIR = gestures
+endif
 
 SUBDIRS = \
 	$(CAP_DIR) \