pidgin3: comparison libpurple/protocols/jabber/jabber.c

-:270edbb2d303
+:32591a46eb78
 #include "jingle/jingle.h"
 #include "jingle/rtp.h"
 #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;
 static void jabber_unregister_account_cb(JabberStream *js);
 void jabber_process_packet(JabberStream *js, xmlnode **packet)
 {
 	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)
 		return;
 	}
 	/* 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;
 #ifdef HAVE_CYRUS_SASL
 	if (js->sasl_maxbuf>0) {
 void jabber_send(JabberStream *js, xmlnode *packet)
 {
 	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)
 		return;
 void jabber_keepalive(PurpleConnection *gc)
 {
 	JabberStream *js = gc->proto_data;
 	if (js->keepalive_timeout == -1) {
-		jabber_ping_jid(js, js->user->domain);
+		jabber_keepalive_ping(js);
 		js->keepalive_timeout = purple_timeout_add_seconds(120,
 				(GSourceFunc)(jabber_keepalive_timeout), gc);
 	}
 }
 	/* Tell the app that we're doing encryption */
 	jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING_ENCRYPTION);
 }
 static void
 txt_resolved_cb(GSList *responses, gpointer data)
 {
 	JabberStream *js = data;
 	js->srv_query_data = NULL;
 		gchar *tmp;
 		tmp = g_strdup_printf(_("Could not find alternative XMPP connection methods after failing to connect directly.\n"));
 		purple_connection_error_reason (js->gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp);
 		g_free(tmp);
 		return;
 	}
 	while (responses) {
 		PurpleTxtResponse *resp = responses->data;
 		gchar **token;
 	/* cancel DNS query for STUN, if one is ongoing */
 	if (js->stun_query) {
 		purple_dnsquery_destroy(js->stun_query);
 		js->stun_query = NULL;
 	}
 	g_free(js);
 	gc->proto_data = NULL;
 }
 	GList *identity;
 	JabberIdentity *ident;
 	/* both required according to XEP-0030 */
 	g_return_if_fail(category != NULL);
 	g_return_if_fail(type != NULL);
 	for(identity = jabber_identities; identity; identity = identity->next) {
 		JabberIdentity *ident = (JabberIdentity*)identity->data;
 		if (!strcmp(ident->category, category) &&
 		    !strcmp(ident->type, type) &&
 		    ((!ident->lang && !lang) || (ident->lang && lang && !strcmp(ident->lang, lang)))) {
 			return;
 		}
 	}
 	ident = g_new0(JabberIdentity, 1);
 	ident->category = g_strdup(category);
 	ident->type = g_strdup(type);
 	return ret;
 }
 static void
 jabber_tooltip_add_resource_text(JabberBuddyResource *jbr,
 	PurpleNotifyUserInfo *user_info, gboolean multiple_resources)
 {
 	char *text = NULL;
 	char *res = NULL;
 	char *label, *value;
 	purple_notify_user_info_add_pair(user_info, label, value);
 	g_free(label);
 	g_free(value);
 	g_free(text);
 	/* if the resource is idle, show that */
 	/* only show it if there is more than one resource available for
 	the buddy, since the "general" idleness will be shown anyway,
 	this way we can see see the idleness of lower-priority resources */
 	if (jbr->idle && multiple_resources) {
 		gchar *idle_str =
 			purple_str_seconds_to_string(time(NULL) - jbr->idle);
 		label = g_strdup_printf("%s%s", _("Idle"), (res ? res : ""));
 		purple_notify_user_info_add_pair(user_info, label, idle_str);
 		g_free(idle_str);
 		g_free(label);
 		JabberBuddyResource *jbr = NULL;
 		PurplePresence *presence = purple_buddy_get_presence(b);
 		const char *sub;
 		GList *l;
 		const char *mood;
 		gboolean multiple_resources =
 			jb->resources && g_list_next(jb->resources);
 		JabberBuddyResource *top_jbr = jabber_buddy_find_resource(jb, NULL);
 		/* resource-specific info for the top resource */
 		if (top_jbr) {
 			jabber_tooltip_add_resource_text(top_jbr, user_info,
 				multiple_resources);
 		}
 		for(l=jb->resources; l; l = l->next) {
 			jbr = l->data;
 			if (jbr != top_jbr) {
 				jabber_tooltip_add_resource_text(jbr, user_info,
 					multiple_resources);
 			}
 		}
 		if (full) {
 			PurpleStatus *status;
 			status = purple_presence_get_active_status(presence);
 			mood = purple_status_get_attr_string(status, "mood");
 typedef struct {
 	PurpleAccount *account;
 	gchar *who;
 	PurpleMediaSessionType type;
 } JabberMediaRequest;
 static void
 jabber_media_cancel_cb(JabberMediaRequest *request,
 		PurpleRequestFields *fields)
 	g_free(request);
 }
 #endif
 gboolean
 jabber_initiate_media(PurpleAccount *account, const char *who,
 		      PurpleMediaSessionType type)
 {
 #ifdef USE_VV
 	JabberStream *js = (JabberStream *)
 			purple_account_get_connection(account)->proto_data;
 	if (!purple_account_is_connected(account))
 		return FALSE;
 	js = gc->proto_data;
 	if (!(resource = jabber_get_resource(jid)) ||
 	    !(jb = jabber_buddy_find(js, jid, FALSE)) ||
 	    !(jbr = jabber_buddy_find_resource(jb, resource))) {
 		g_free(resource);
 		return FALSE;
 	}
 			strcmp(ui_type, "web") == 0 ||
 			strcmp(ui_type, "bot") == 0) {
 			type = ui_type;
 		}
 	}
-	my_protocol = plugin;
+	jabber_plugin = plugin;
 	jabber_add_identity("client", type, NULL, PACKAGE);
 	/* initialize jabber_features list */
 	jabber_add_feature("jabber:iq:last", 0);

Mercurial > pidgin3 / file comparison

comparison: libpurple/protocols/jabber/jabber.c

libpurple/protocols/jabber/jabber.c