Mercurial > pidgin.yaz

comparison src/protocols/bonjour/bonjour.c @ 13906:b986b6e2441b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 16400] part of sf patch #1490646, from Jonty Wareing & Jono Cole "The user can now specify their AIM and Jabber ID in the preferences" committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 02 Jul 2006 21:52:06 +0000
parents cfc2f7fcb3dd
children 8264f52a1142
comparison
equal deleted inserted replaced
13905:4e44ecb866bd 13906:b986b6e2441b
125 bd->dns_sd_data->last = g_strdup(gaim_account_get_string(account, "last", default_lastname)); 125 bd->dns_sd_data->last = g_strdup(gaim_account_get_string(account, "last", default_lastname));
126 bd->dns_sd_data->port_p2pj = gaim_account_get_int(account, "port", BONJOUR_DEFAULT_PORT_INT); 126 bd->dns_sd_data->port_p2pj = gaim_account_get_int(account, "port", BONJOUR_DEFAULT_PORT_INT);
127 bd->dns_sd_data->phsh = g_strdup(""); 127 bd->dns_sd_data->phsh = g_strdup("");
128 bd->dns_sd_data->email = g_strdup(gaim_account_get_string(account, "email", "")); 128 bd->dns_sd_data->email = g_strdup(gaim_account_get_string(account, "email", ""));
129 bd->dns_sd_data->vc = g_strdup(""); 129 bd->dns_sd_data->vc = g_strdup("");
130 bd->dns_sd_data->jid = g_strdup(""); 130 bd->dns_sd_data->jid = g_strdup(gaim_account_get_string(account, "jid", ""));
131 bd->dns_sd_data->AIM = g_strdup(""); 131 bd->dns_sd_data->AIM = g_strdup(gaim_account_get_string(account, "AIM", ""));
132 132
133 status = gaim_account_get_active_status(account); 133 status = gaim_account_get_active_status(account);
134 presence = gaim_account_get_presence(account); 134 presence = gaim_account_get_presence(account);
135 if (gaim_presence_is_available(presence)) 135 if (gaim_presence_is_available(presence))
136 bd->dns_sd_data->status = g_strdup("avail"); 136 bd->dns_sd_data->status = g_strdup("avail");
586 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 586 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
587 587
588 option = gaim_account_option_string_new(_("E-mail"), "email", ""); 588 option = gaim_account_option_string_new(_("E-mail"), "email", "");
589 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 589 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
590 590
591 option = gaim_account_option_string_new(_("AIM Account"), "AIM", "");
592 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
593
594 option = gaim_account_option_string_new(_("Jabber Account"), "jid", "");
595 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
596
591 my_protocol = plugin; 597 my_protocol = plugin;
592 } 598 }
593 599
594 GAIM_INIT_PLUGIN(bonjour, init_plugin, info); 600 GAIM_INIT_PLUGIN(bonjour, init_plugin, info);