Mercurial > pidgin
comparison libpurple/protocols/jabber/buddy.c @ 21351:7b30d02a36aa
merge of '55275a531f00a6cabade1b8bfe74eafa3c2db4ba'
and 'a4922c657f183e4b124142298268ba47350a72e0'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 16 Nov 2007 23:01:34 +0000 |
parents | d4f95419be45 |
children | 8ae227dca885 |
comparison
equal
deleted
inserted
replaced
21334:e76b99d95214 | 21351:7b30d02a36aa |
---|---|
725 "information with which you feel comfortable."), | 725 "information with which you feel comfortable."), |
726 fields, | 726 fields, |
727 _("Save"), G_CALLBACK(jabber_format_info), | 727 _("Save"), G_CALLBACK(jabber_format_info), |
728 _("Cancel"), NULL, | 728 _("Cancel"), NULL, |
729 purple_connection_get_account(gc), NULL, NULL, | 729 purple_connection_get_account(gc), NULL, NULL, |
730 PURPLE_REQUEST_UI_HINT_ACCOUNT, gc); | 730 PURPLE_REQUEST_HINT_ACCOUNT, gc); |
731 } | 731 } |
732 | 732 |
733 /*---------------------------------------*/ | 733 /*---------------------------------------*/ |
734 /* End Jabber "set info" (vCard) support */ | 734 /* End Jabber "set info" (vCard) support */ |
735 /*---------------------------------------*/ | 735 /*---------------------------------------*/ |
2413 purple_request_fields_with_hint(js->gc, _("Search for XMPP users"), | 2413 purple_request_fields_with_hint(js->gc, _("Search for XMPP users"), |
2414 _("Search for XMPP users"), instructions, fields, | 2414 _("Search for XMPP users"), instructions, fields, |
2415 _("Search"), G_CALLBACK(user_search_cb), | 2415 _("Search"), G_CALLBACK(user_search_cb), |
2416 _("Cancel"), G_CALLBACK(user_search_cancel_cb), | 2416 _("Cancel"), G_CALLBACK(user_search_cancel_cb), |
2417 purple_connection_get_account(js->gc), NULL, NULL, | 2417 purple_connection_get_account(js->gc), NULL, NULL, |
2418 PURPLE_REQUEST_UI_HINT_ACCOUNT, usi); | 2418 PURPLE_REQUEST_HINT_ACCOUNT, usi); |
2419 | 2419 |
2420 g_free(instructions); | 2420 g_free(instructions); |
2421 } | 2421 } |
2422 } | 2422 } |
2423 | 2423 |
2449 js->user_directories ? js->user_directories->data : NULL, | 2449 js->user_directories ? js->user_directories->data : NULL, |
2450 FALSE, FALSE, NULL, | 2450 FALSE, FALSE, NULL, |
2451 _("Search Directory"), PURPLE_CALLBACK(jabber_user_search), | 2451 _("Search Directory"), PURPLE_CALLBACK(jabber_user_search), |
2452 _("Cancel"), NULL, | 2452 _("Cancel"), NULL, |
2453 NULL, NULL, NULL, | 2453 NULL, NULL, NULL, |
2454 PURPLE_REQUEST_UI_HINT_ACCOUNT, js); | 2454 PURPLE_REQUEST_HINT_ACCOUNT, js); |
2455 } | 2455 } |
2456 | 2456 |
2457 | 2457 |
2458 | 2458 |