summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--res/res_jabber.c6
-rw-r--r--res/res_xmpp.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 0e41cdf77..b534e803b 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -3330,7 +3330,7 @@ static void aji_init_event_distribution(struct aji_client *client)
*/
static int aji_handle_pubsub_event(void *data, ikspak *pak)
{
- char *item_id, *device_state, *context, *cachable_str;
+ char *item_id, *device_state, *mailbox, *cachable_str;
int oldmsgs, newmsgs;
iks *item, *item_content;
struct ast_eid pubsub_eid;
@@ -3359,11 +3359,11 @@ static int aji_handle_pubsub_event(void *data, ikspak *pak)
&pubsub_eid);
return IKS_FILTER_EAT;
} else if (!strcasecmp(iks_name(item_content), "mailbox")) {
- context = strsep(&item_id, "@");
+ mailbox = strsep(&item_id, "@");
sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
- ast_publish_mwi_state_full(item_id, context, newmsgs, oldmsgs, NULL, &pubsub_eid);
+ ast_publish_mwi_state_full(mailbox, item_id, newmsgs, oldmsgs, NULL, &pubsub_eid);
return IKS_FILTER_EAT;
} else {
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index 1a3ccd3a6..e4ecd44ec 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -1450,7 +1450,7 @@ static void xmpp_pubsub_subscribe(struct ast_xmpp_client *client, const char *no
*/
static int xmpp_pubsub_handle_event(void *data, ikspak *pak)
{
- char *item_id, *device_state, *context, *cachable_str;
+ char *item_id, *device_state, *mailbox, *cachable_str;
int oldmsgs, newmsgs;
iks *item, *item_content;
struct ast_eid pubsub_eid;
@@ -1478,11 +1478,11 @@ static int xmpp_pubsub_handle_event(void *data, ikspak *pak)
&pubsub_eid);
return IKS_FILTER_EAT;
} else if (!strcasecmp(iks_name(item_content), "mailbox")) {
- context = strsep(&item_id, "@");
+ mailbox = strsep(&item_id, "@");
sscanf(iks_find_cdata(item_content, "OLDMSGS"), "%10d", &oldmsgs);
sscanf(iks_find_cdata(item_content, "NEWMSGS"), "%10d", &newmsgs);
- ast_publish_mwi_state_full(item_id, context, newmsgs, oldmsgs, NULL, &pubsub_eid);
+ ast_publish_mwi_state_full(mailbox, item_id, newmsgs, oldmsgs, NULL, &pubsub_eid);
return IKS_FILTER_EAT;
} else {