Mercurial > pidgin.yaz
comparison libpurple/protocols/bonjour/bonjour.c @ 23391:5c70d953a497
propagate from branch 'im.pidgin.pidgin.2.4.3' (head 709ec9c29e9d76eebbded25061107ef0a2a2b148)
to branch 'im.pidgin.pidgin' (head e8d624d4b86e9505bb225f2a6e7b29ec6c8affed)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Thu, 26 Jun 2008 09:07:56 +0000 |
parents | fb7a42a09789 e0bcb8cfda74 |
children | 399975ad001c 3da0957e7821 |
comparison
equal
deleted
inserted
replaced
23057:d04d24b1db9b | 23391:5c70d953a497 |
---|---|
382 if (bb->first != NULL) | 382 if (bb->first != NULL) |
383 purple_notify_user_info_add_pair(user_info, _("Last name"), bb->last); | 383 purple_notify_user_info_add_pair(user_info, _("Last name"), bb->last); |
384 } | 384 } |
385 | 385 |
386 if (bb->email != NULL) | 386 if (bb->email != NULL) |
387 purple_notify_user_info_add_pair(user_info, _("E-Mail"), bb->email); | 387 purple_notify_user_info_add_pair(user_info, _("Email"), bb->email); |
388 | 388 |
389 if (bb->AIM != NULL) | 389 if (bb->AIM != NULL) |
390 purple_notify_user_info_add_pair(user_info, _("AIM Account"), bb->AIM); | 390 purple_notify_user_info_add_pair(user_info, _("AIM Account"), bb->AIM); |
391 | 391 |
392 if (bb->jid!= NULL) | 392 if (bb->jid!= NULL) |
502 | 502 |
503 /* padding */ | 503 /* padding */ |
504 NULL, | 504 NULL, |
505 NULL, | 505 NULL, |
506 NULL, | 506 NULL, |
507 sizeof(PurplePluginProtocolInfo), /* struct_size */ | |
507 NULL | 508 NULL |
508 }; | 509 }; |
509 | 510 |
510 static PurplePluginInfo info = | 511 static PurplePluginInfo info = |
511 { | 512 { |
716 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); | 717 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
717 | 718 |
718 option = purple_account_option_string_new(_("Last name"), "last", default_lastname); | 719 option = purple_account_option_string_new(_("Last name"), "last", default_lastname); |
719 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); | 720 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
720 | 721 |
721 option = purple_account_option_string_new(_("E-mail"), "email", ""); | 722 option = purple_account_option_string_new(_("Email"), "email", ""); |
722 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); | 723 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
723 | 724 |
724 option = purple_account_option_string_new(_("AIM Account"), "AIM", ""); | 725 option = purple_account_option_string_new(_("AIM Account"), "AIM", ""); |
725 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); | 726 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); |
726 | 727 |