Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/message.c @ 17616:9686d549f084
Switched buzz namespace and tag name to be libpurple-specific and use a more professionally-sounding name ('attention' instead of 'buzz').
author | Andreas Monitzer <pidgin@monitzer.com> |
---|---|
date | Tue, 03 Jul 2007 11:04:50 +0000 |
parents | cca457b9158b |
children | 935005186312 |
comparison
equal
deleted
inserted
replaced
17615:cca457b9158b | 17616:9686d549f084 |
---|---|
282 PurpleBuddy *buddy; | 282 PurpleBuddy *buddy; |
283 PurpleAccount *account; | 283 PurpleAccount *account; |
284 PurpleConversation *c; | 284 PurpleConversation *c; |
285 char *username, *str; | 285 char *username, *str; |
286 | 286 |
287 /* Delayed buzz MUST NOT be accepted */ | |
288 if(jm->delayed) | |
289 return; | |
290 | |
287 account = purple_connection_get_account(jm->js->gc); | 291 account = purple_connection_get_account(jm->js->gc); |
288 c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, jm->from); | |
289 | 292 |
290 if ((buddy = purple_find_buddy(account, jm->from)) != NULL) | 293 if ((buddy = purple_find_buddy(account, jm->from)) != NULL) |
291 username = g_markup_escape_text(purple_buddy_get_alias(buddy), -1); | 294 username = g_markup_escape_text(purple_buddy_get_alias(buddy), -1); |
292 else | 295 else |
293 username = g_markup_escape_text(jm->from, -1); | 296 return; /* Do not accept buzzes from unknown people */ |
294 | 297 |
298 c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, jm->from); | |
299 | |
295 str = g_strdup_printf(_("%s just sent you a Buzz!"), username); | 300 str = g_strdup_printf(_("%s just sent you a Buzz!"), username); |
296 | 301 |
297 purple_conversation_write(c, NULL, str, PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NOTIFY, time(NULL)); | 302 purple_conversation_write(c, NULL, str, PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NOTIFY, time(NULL)); |
298 g_free(username); | 303 g_free(username); |
299 g_free(str); | 304 g_free(str); |
382 } else if(!strcmp(child->name, "event") && !strcmp(xmlns,"http://jabber.org/protocol/pubsub#event")) { | 387 } else if(!strcmp(child->name, "event") && !strcmp(xmlns,"http://jabber.org/protocol/pubsub#event")) { |
383 xmlnode *items; | 388 xmlnode *items; |
384 jm->type = JABBER_MESSAGE_EVENT; | 389 jm->type = JABBER_MESSAGE_EVENT; |
385 for(items = xmlnode_get_child(child,"items"); items; items = items->next) | 390 for(items = xmlnode_get_child(child,"items"); items; items = items->next) |
386 jm->eventitems = g_list_append(jm->eventitems, items); | 391 jm->eventitems = g_list_append(jm->eventitems, items); |
387 } else if(!strcmp(child->name, "buzz") && !strcmp(xmlns,"http://pidgin.im/xmpp/buzz")) { | 392 } else if(!strcmp(child->name, "attention") && !strcmp(xmlns,"http://pidgin.im/libpurple/xmpp/attention")) { |
388 jm->hasBuzz = TRUE; | 393 jm->hasBuzz = TRUE; |
389 } else if(!strcmp(child->name, "error")) { | 394 } else if(!strcmp(child->name, "error")) { |
390 const char *code = xmlnode_get_attrib(child, "code"); | 395 const char *code = xmlnode_get_attrib(child, "code"); |
391 char *code_txt = NULL; | 396 char *code_txt = NULL; |
392 char *text = xmlnode_get_data(child); | 397 char *text = xmlnode_get_data(child); |