{
char xmlbuf[256];
+<<<<<<< HEAD
+ syslog(LOG_DEBUG, "XMPP: indicating presence of <%s> to <%s>", presence_jid, XMPP->client_jid);
+=======
+>>>>>>> 1c0b8162b0a90f2e97028a531005c11b09441498
cprintf("<presence from=\"%s\" ", xmlesc(xmlbuf, presence_jid, sizeof xmlbuf));
cprintf("to=\"%s\"></presence>", xmlesc(xmlbuf, XMPP->client_jid, sizeof xmlbuf));
}
*/
void xmpp_presence_notify(char *presence_jid, int event_type) {
struct CitContext *cptr;
- static int unsolicited_id;
+ static int unsolicited_id = 12345;
int visible_sessions = 0;
int nContexts, i;
int which_cptr_is_relevant = (-1);
}
}
- syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
- visible_sessions, presence_jid, CC->cs_pid);
+ syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n", visible_sessions, presence_jid, CC->cs_pid);
if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) {
- syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n",
- CC->cs_pid, presence_jid);
+ syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n", CC->cs_pid, presence_jid);
/* Do an unsolicited roster update that adds a new contact. */
assert(which_cptr_is_relevant >= 0);
if (visible_sessions == 0) {
syslog(LOG_DEBUG, "Telling session %d that <%s> logged out\n",
- CC->cs_pid, presence_jid);
+ CC->cs_pid, presence_jid);
xmpp_destroy_buddy(presence_jid, 0); /* non aggressive presence update */
}
/* now add anyone we find into the hashlist */
/* skip past the headers */
- ptr = strstr(msg->cm_fields['M'], "\n\n");
+ ptr = strstr(msg->cm_fields[eMesageText], "\n\n");
if (ptr != NULL) {
ptr += 2;
}
else {
- ptr = strstr(msg->cm_fields['M'], "\n\r\n");
+ ptr = strstr(msg->cm_fields[eMesageText], "\n\r\n");
if (ptr != NULL) {
ptr += 3;
}
}
}
- CtdlFreeMessage(msg);
+ CM_Free(msg);
}