Mercurial > pidgin.yaz

comparison libpurple/protocols/bonjour/bonjour.c @ 25438:4b8c4870b13a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.next.minor' (head 7305b29db7bd00d3261f348c71674c93aa31b327) to branch 'im.pidgin.pidgin' (head d8c03c68d591d9392607d954942ee58b8618d946)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 02 Mar 2009 04:18:40 +0000
parents 367b3ddcf5c3 f38799160cfa
children ff4212a5268f
comparison
equal deleted inserted replaced
25437:8998ca47e6d0 25438:4b8c4870b13a
100 gc->flags |= PURPLE_CONNECTION_HTML; 100 gc->flags |= PURPLE_CONNECTION_HTML;
101 gc->proto_data = bd = g_new0(BonjourData, 1); 101 gc->proto_data = bd = g_new0(BonjourData, 1);
102 102
103 /* Start waiting for jabber connections (iChat style) */ 103 /* Start waiting for jabber connections (iChat style) */
104 bd->jabber_data = g_new0(BonjourJabber, 1); 104 bd->jabber_data = g_new0(BonjourJabber, 1);
105 bd->jabber_data->port = BONJOUR_DEFAULT_PORT_INT; 105 bd->jabber_data->port = purple_account_get_int(account, "port", BONJOUR_DEFAULT_PORT);
106 bd->jabber_data->account = account; 106 bd->jabber_data->account = account;
107 107
108 if (bonjour_jabber_start(bd->jabber_data) == -1) { 108 if (bonjour_jabber_start(bd->jabber_data) == -1) {
109 /* Send a message about the connection error */ 109 /* Send a message about the connection error */
110 purple_connection_error_reason (gc, 110 purple_connection_error_reason (gc,
703 /* Creating the user splits */ 703 /* Creating the user splits */
704 split = purple_account_user_split_new(_("Hostname"), default_hostname, '@'); 704 split = purple_account_user_split_new(_("Hostname"), default_hostname, '@');
705 prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); 705 prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
706 706
707 /* Creating the options for the protocol */ 707 /* Creating the options for the protocol */
708 option = purple_account_option_int_new(_("Local Port"), "port", BONJOUR_DEFAULT_PORT);
709 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
710
708 option = purple_account_option_string_new(_("First name"), "first", default_firstname); 711 option = purple_account_option_string_new(_("First name"), "first", default_firstname);
709 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 712 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
710 713
711 option = purple_account_option_string_new(_("Last name"), "last", default_lastname); 714 option = purple_account_option_string_new(_("Last name"), "last", default_lastname);
712 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option); 715 prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);