pidgin: f85ecfec: Fix building on Windows and better integ...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: f85ecfecb74adc7eb5b966a0d51ee930610fe837
Ancestor: f746b5a6228420ac34a507468ce720ddaa8e9905
Author: deryni at pidgin.im
Date: 2009-05-22T04:08:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f85ecfecb74adc7eb5b966a0d51ee930610fe837

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c

ChangeLog: 

Fix building on Windows and better integrate the new signals with the pre-existing ones.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	6e63c0d634fbbe50ce0a9f94c4513fd9e676a7a9
+++ libpurple/protocols/jabber/jabber.c	1b13af6b0272ad467c72843a54a7e53066a144e6
@@ -67,7 +67,7 @@
 
 #define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5)
 
-static PurplePlugin *my_protocol = NULL;
+PurplePlugin *jabber_plugin = NULL;
 GList *jabber_features = NULL;
 GList *jabber_identities = NULL;
 GSList *jabber_cmds = NULL;
@@ -252,7 +252,7 @@ void jabber_process_packet(JabberStream 
 {
 	const char *xmlns;
 
-	purple_signal_emit(my_protocol, "jabber-receiving-xmlnode", js->gc, packet);
+	purple_signal_emit(jabber_plugin, "jabber-receiving-xmlnode", js->gc, packet);
 
 	/* if the signal leaves us with a null packet, we're done */
 	if(NULL == *packet)
@@ -406,7 +406,7 @@ void jabber_send_raw(JabberStream *js, c
 	/* If we've got a security layer, we need to encode the data,
 	 * splitting it on the maximum buffer length negotiated */
 
-	purple_signal_emit(my_protocol, "jabber-sending-text", js->gc, &data);
+	purple_signal_emit(jabber_plugin, "jabber-sending-text", js->gc, &data);
 	if (data == NULL)
 		return;
 
@@ -458,7 +458,7 @@ void jabber_send(JabberStream *js, xmlno
 	char *txt;
 	int len;
 
-	purple_signal_emit(my_protocol, "jabber-sending-xmlnode", js->gc, &packet);
+	purple_signal_emit(jabber_plugin, "jabber-sending-xmlnode", js->gc, &packet);
 
 	/* if we get NULL back, we're done processing */
 	if(NULL == packet)
@@ -3331,7 +3331,7 @@ jabber_init_plugin(PurplePlugin *plugin)
 void
 jabber_init_plugin(PurplePlugin *plugin)
 {
-	my_protocol = plugin;
+	jabber_plugin = plugin;
 
 	jabber_add_identity("client", "pc", NULL, PACKAGE);
 
============================================================
--- libpurple/protocols/jabber/libxmpp.c	385d900e24573bbdd6ee0b02ec605cf013538720
+++ libpurple/protocols/jabber/libxmpp.c	2b06cdcf7e2d15ccff7a0526b721ad80cd99c36d
@@ -46,8 +46,6 @@
 #include "data.h"
 #include "ibb.h"
 
-PurplePlugin *jabber_plugin = NULL;
-
 static PurplePluginProtocolInfo prpl_info =
 {
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK |
@@ -127,8 +125,6 @@ static gboolean load_plugin(PurplePlugin
 
 static gboolean load_plugin(PurplePlugin *plugin)
 {
-	jabber_plugin = plugin;
-
 	purple_signal_register(plugin, "jabber-receiving-xmlnode",
 			purple_marshal_VOID__POINTER_POINTER, NULL, 2,
 			purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
@@ -219,8 +215,6 @@ static gboolean unload_plugin(PurplePlug
 	/* Stay on target...stay on target... Almost there... */
 	jabber_uninit_plugin();
 
-	jabber_plugin = NULL;
-
 	return TRUE;
 }