comparison libpurple/protocols/jabber/jabber.c @ 17576:e49b259fc7dd

PEP publishing features are now only announced in disco#info when PEP is supported by the server.

17575:5fc8a8a25008

#include "roster.h"
#include "ping.h"
#include "si.h"
#include "xdata.h"
#include "pep.h"

#define JABBER_CONNECT_STEPS (js->gsc ? 8 : 5)

static PurplePlugin *my_protocol = NULL;
GList *jabber_features;

	JabberStream *js = gc->proto_data;

	js->idle = idle ? time(NULL) - idle : idle;
}

void jabber_add_feature(const char *shortname, const char *namespace) {
	JabberFeature *feat = g_new0(JabberFeature,1);
	feat->shortname = g_strdup(shortname);
	feat->namespace = g_strdup(namespace);
	
	/* try to remove just in case it already exists in the list */
	jabber_remove_feature(shortname);
	
	jabber_features = g_list_append(jabber_features, feat);

	/* } */

	act = purple_plugin_action_new(_("Search for Users..."),
								 jabber_user_search_begin);
	m = g_list_append(m, act);
	
	if(js->pep)
		jabber_pep_init_actions(&m);

	return m;
}

17576:e49b259fc7dd

#include "roster.h"
#include "ping.h"
#include "si.h"
#include "xdata.h"
#include "pep.h"

#include <assert.h>

#define JABBER_CONNECT_STEPS (js->gsc ? 8 : 5)

static PurplePlugin *my_protocol = NULL;
GList *jabber_features;

	JabberStream *js = gc->proto_data;

	js->idle = idle ? time(NULL) - idle : idle;
}

void jabber_add_feature(const char *shortname, const char *namespace, JabberFeatureEnabled cb) {
	JabberFeature *feat;
	
	assert(shortname != NULL);
	assert(namespace != NULL);
	
	feat = g_new0(JabberFeature,1);
	feat->shortname = g_strdup(shortname);
	feat->namespace = g_strdup(namespace);
	feat->is_enabled = cb;
	
	/* try to remove just in case it already exists in the list */
	jabber_remove_feature(shortname);
	
	jabber_features = g_list_append(jabber_features, feat);

	/* } */

	act = purple_plugin_action_new(_("Search for Users..."),
								 jabber_user_search_begin);
	m = g_list_append(m, act);

	purple_debug_info("jabber", "jabber_actions: have pep: %s\n", js->pep?"YES":"NO");

	if(js->pep)
		jabber_pep_init_actions(&m);

	return m;
}