soc.2009.webkitmessageview: 1d8ec934: Well, chat is sorta kinda working.

tdrhq at soc.pidgin.im tdrhq at soc.pidgin.im
Tue Aug 25 12:01:59 EDT 2009


-----------------------------------------------------------------
Revision: 1d8ec9342e0e4c1f689d718dea882f6c6cd2b4f9
Ancestor: 5970675ec0a6ab8fca64ac8ae7167696ff83a2cf
Author: tdrhq at soc.pidgin.im
Date: 2009-08-10T01:21:57
Branch: im.pidgin.soc.2009.webkitmessageview
URL: http://d.pidgin.im/viewmtn/revision/info/1d8ec9342e0e4c1f689d718dea882f6c6cd2b4f9

Modified files:
        pidgin/plugins/adiumthemes/webkit.c

ChangeLog: 

Well, chat is sorta kinda working.

-------------- next part --------------
============================================================
--- pidgin/plugins/adiumthemes/webkit.c	7420bf6259c7ce02442fb43671214c83977442f0
+++ pidgin/plugins/adiumthemes/webkit.c	ecd6315ae09acf377a3d7439b15f2ee9964f76f8
@@ -341,7 +341,8 @@ static gboolean purple_webkit_execute_sc
 	return FALSE;
 }
 
-static gboolean purple_webkit_displaying_im_msg (PurpleAccount *account,
+
+static gboolean webkit_on_displaying_im_msg (PurpleAccount *account,
 						 const char* name,
 						 char **pmessage,
 						 PurpleConversation *conv,
@@ -401,6 +402,16 @@ static gboolean purple_webkit_displaying
 	return TRUE; /* GtkConv should not handle this guy */
 }
 
+static gboolean webkit_on_displaying_chat_msg (PurpleAccount *account,
+					       const char *who,
+					       char **message,
+					       PurpleConversation *conv,
+					       PurpleMessageFlags flags,
+					       gpointer userdata)
+{
+	/* handle exactly like an IM message */
+	return webkit_on_displaying_im_msg (account, who, message, conv, flags, NULL);
+}
 
 static void
 webkit_on_converstation_displayed (PidginConversation *gtkconv, gpointer data)
@@ -554,10 +565,16 @@ plugin_load(PurplePlugin *plugin)
 	purple_signal_connect (pidgin_conversations_get_handle (),
 			       "displaying-im-msg",
 			       webkit_plugin_get_handle (),
-			       PURPLE_CALLBACK(purple_webkit_displaying_im_msg),
+			       PURPLE_CALLBACK(webkit_on_displaying_im_msg),
 			       NULL);
 			    
 	purple_signal_connect (pidgin_conversations_get_handle (),
+			       "displaying-chat-msg",
+			       webkit_plugin_get_handle (),
+			       PURPLE_CALLBACK(webkit_on_displaying_chat_msg),
+			       NULL);
+
+	purple_signal_connect (pidgin_conversations_get_handle (),
 			       "conversation-displayed",
 			       webkit_plugin_get_handle (),
 			       PURPLE_CALLBACK(webkit_on_converstation_displayed),


More information about the Commits mailing list