Mercurial > pidgin
comparison libpurple/protocols/jabber/presence.c @ 21098:7e200a629109
explicit merge of '8f24e3576448fefbc861e06f1e8d5fe17db2e71a'
and '49d0219884ede2c6c571f2df73e29dffa86f54ad'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 14 Oct 2007 02:13:14 +0000 |
parents | fdefa5eb46e2 |
children | 8c9aad9479c0 0b67d509a305 |
comparison
equal
deleted
inserted
replaced
21093:5e46cdf9ef2b | 21098:7e200a629109 |
---|---|
498 const char *code = xmlnode_get_attrib(z, "code"); | 498 const char *code = xmlnode_get_attrib(z, "code"); |
499 if(code && !strcmp(code, "201")) { | 499 if(code && !strcmp(code, "201")) { |
500 if((chat = jabber_chat_find(js, jid->node, jid->domain))) { | 500 if((chat = jabber_chat_find(js, jid->node, jid->domain))) { |
501 chat->config_dialog_type = PURPLE_REQUEST_ACTION; | 501 chat->config_dialog_type = PURPLE_REQUEST_ACTION; |
502 chat->config_dialog_handle = | 502 chat->config_dialog_handle = |
503 purple_request_action(js->gc, | 503 purple_request_action_with_hint(js->gc, |
504 _("Create New Room"), | 504 _("Create New Room"), |
505 _("Create New Room"), | 505 _("Create New Room"), |
506 _("You are creating a new room. Would" | 506 _("You are creating a new room. Would" |
507 " you like to configure it, or" | 507 " you like to configure it, or" |
508 " accept the default settings?"), | 508 " accept the default settings?"), |
509 /* Default Action */ 1, | 509 /* Default Action */ 1, |
510 purple_connection_get_account(js->gc), NULL, chat->conv, | 510 purple_connection_get_account(js->gc), NULL, chat->conv, |
511 chat, 2, | 511 "chat", chat, 2, |
512 _("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure), | 512 _("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure), |
513 _("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room)); | 513 _("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room)); |
514 } | 514 } |
515 } else if(code && !strcmp(code, "210")) { | 515 } else if(code && !strcmp(code, "210")) { |
516 /* server rewrote room-nick */ | 516 /* server rewrote room-nick */ |