Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/xmpp.c @ 1665:1a4890514eb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up some dead assignments/dead variables
author Ulrich Spörlein
date Tue, 02 Feb 2010 19:44:39 +0100
parents dcb0b4522ded
children
comparison
equal deleted inserted replaced
1664:2f6bdfa0cb01 1665:1a4890514eb9
1097 1097
1098 // MUC 1098 // MUC
1099 // Make sure this is a room (it can be a conversion user->room) 1099 // Make sure this is a room (it can be a conversion user->room)
1100 room_elt = roster_find(bjid, jidsearch, 0); 1100 room_elt = roster_find(bjid, jidsearch, 0);
1101 if (!room_elt) { 1101 if (!room_elt) {
1102 room_elt = roster_add_user(bjid, NULL, NULL, ROSTER_TYPE_ROOM, 1102 roster_add_user(bjid, NULL, NULL, ROSTER_TYPE_ROOM, sub_none, -1);
1103 sub_none, -1);
1104 } else { 1103 } else {
1105 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM); 1104 buddy_settype(room_elt->data, ROSTER_TYPE_ROOM);
1106 } 1105 }
1107 1106
1108 buddylist_build(); 1107 buddylist_build();
1458 mstype = lm_message_get_sub_type(m); 1457 mstype = lm_message_get_sub_type(m);
1459 1458
1460 if (mstype == LM_MESSAGE_SUB_TYPE_SUBSCRIBE) { 1459 if (mstype == LM_MESSAGE_SUB_TYPE_SUBSCRIBE) {
1461 /* The sender wishes to subscribe to our presence */ 1460 /* The sender wishes to subscribe to our presence */
1462 const char *msg; 1461 const char *msg;
1463 int isagent;
1464 eviqs *evn; 1462 eviqs *evn;
1465 1463
1466 isagent = (roster_gettype(r) & ROSTER_TYPE_AGENT) != 0;
1467 msg = lm_message_node_get_child_value(m->node, "status"); 1464 msg = lm_message_node_get_child_value(m->node, "status");
1468 1465
1469 buf = g_strdup_printf("<%s> wants to subscribe to your presence updates", 1466 buf = g_strdup_printf("<%s> wants to subscribe to your presence updates",
1470 from); 1467 from);
1471 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0); 1468 scr_WriteIncomingMessage(r, buf, 0, HBB_PREFIX_INFO, 0);