Mercurial > pidgin
comparison libpurple/protocols/jabber/presence.c @ 21360:e747ac0c42d6
propagate from branch 'im.pidgin.pidgin.next.minor' (head bd8f1d754a1b94e5ade30c3b135178b236f7b49a)
to branch 'im.pidgin.cpw.resiak.disconnectreason' (head 5d84bcfaddc07cab4419ab9f04b31626421b97ff)
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Mon, 15 Oct 2007 10:45:46 +0000 |
| parents | fa3c4c5dea66 a20ef7180680 |
| children | 665e04562de0 |
comparison
equal
deleted
inserted
replaced
| 21359:fe57b8062249 | 21360:e747ac0c42d6 |
|---|---|
| 510 const char *code = xmlnode_get_attrib(z, "code"); | 510 const char *code = xmlnode_get_attrib(z, "code"); |
| 511 if(code && !strcmp(code, "201")) { | 511 if(code && !strcmp(code, "201")) { |
| 512 if((chat = jabber_chat_find(js, jid->node, jid->domain))) { | 512 if((chat = jabber_chat_find(js, jid->node, jid->domain))) { |
| 513 chat->config_dialog_type = PURPLE_REQUEST_ACTION; | 513 chat->config_dialog_type = PURPLE_REQUEST_ACTION; |
| 514 chat->config_dialog_handle = | 514 chat->config_dialog_handle = |
| 515 purple_request_action(js->gc, | 515 purple_request_action_with_hint(js->gc, |
| 516 _("Create New Room"), | 516 _("Create New Room"), |
| 517 _("Create New Room"), | 517 _("Create New Room"), |
| 518 _("You are creating a new room. Would" | 518 _("You are creating a new room. Would" |
| 519 " you like to configure it, or" | 519 " you like to configure it, or" |
| 520 " accept the default settings?"), | 520 " accept the default settings?"), |
| 521 /* Default Action */ 1, | 521 /* Default Action */ 1, |
| 522 purple_connection_get_account(js->gc), NULL, chat->conv, | 522 purple_connection_get_account(js->gc), NULL, chat->conv, |
| 523 chat, 2, | 523 PURPLE_REQUEST_UI_HINT_CONV, chat, 2, |
| 524 _("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure), | 524 _("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure), |
| 525 _("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room)); | 525 _("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room)); |
| 526 } | 526 } |
| 527 } else if(code && !strcmp(code, "210")) { | 527 } else if(code && !strcmp(code, "210")) { |
| 528 /* server rewrote room-nick */ | 528 /* server rewrote room-nick */ |