Mercurial > pidgin
changeset 16951:88444e60ea95
Removes 'jabber.org' defaults from XMPP. I think we had agreed this was a good idea.
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Tue, 08 May 2007 22:08:46 +0000 |
| parents | 9133ce89c9d7 |
| children | 919515748253 |
| files | libpurple/protocols/jabber/buddy.c libpurple/protocols/jabber/chat.c libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/libxmpp.c |
| diffstat | 4 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.c Tue May 08 21:05:30 2007 +0000 +++ b/libpurple/protocols/jabber/buddy.c Tue May 08 22:08:46 2007 +0000 @@ -1793,7 +1793,7 @@ purple_request_input(gc, _("Enter a User Directory"), _("Enter a User Directory"), _("Select a user directory to search"), - js->user_directories ? js->user_directories->data : "users.jabber.org", + js->user_directories ? js->user_directories->data : NULL, FALSE, FALSE, NULL, _("Search Directory"), PURPLE_CALLBACK(jabber_user_search_ok), _("Cancel"), NULL,
--- a/libpurple/protocols/jabber/chat.c Tue May 08 21:05:30 2007 +0000 +++ b/libpurple/protocols/jabber/chat.c Tue May 08 22:08:46 2007 +0000 @@ -75,8 +75,6 @@ if (js->chat_servers) g_hash_table_insert(defaults, "server", g_strdup(js->chat_servers->data)); - else - g_hash_table_insert(defaults, "server", g_strdup("conference.jabber.org")); if (chat_name != NULL) { JabberID *jid = jabber_id_new(chat_name); @@ -782,7 +780,7 @@ purple_request_input(gc, _("Enter a Conference Server"), _("Enter a Conference Server"), _("Select a conference server to query"), - js->chat_servers ? js->chat_servers->data : "conference.jabber.org", + js->chat_servers ? js->chat_servers->data : NULL, FALSE, FALSE, NULL, _("Find Rooms"), PURPLE_CALLBACK(roomlist_ok_cb), _("Cancel"), PURPLE_CALLBACK(roomlist_cancel_cb),
--- a/libpurple/protocols/jabber/jabber.c Tue May 08 21:05:30 2007 +0000 +++ b/libpurple/protocols/jabber/jabber.c Tue May 08 22:08:46 2007 +0000 @@ -556,7 +556,6 @@ g_free, (GDestroyNotify)jabber_buddy_free); js->chats = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify)jabber_chat_free); - js->chat_servers = g_list_append(NULL, g_strdup("conference.jabber.org")); js->user = jabber_id_new(purple_account_get_username(account)); js->next_id = g_random_int(); js->write_buffer = purple_circ_buffer_new(512);
--- a/libpurple/protocols/jabber/libxmpp.c Tue May 08 21:05:30 2007 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Tue May 08 22:08:46 2007 +0000 @@ -191,7 +191,7 @@ PurpleAccountUserSplit *split; PurpleAccountOption *option; - split = purple_account_user_split_new(_("Server"), "jabber.org", '@'); + split = purple_account_user_split_new(_("Server"), NULL, '@'); prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); split = purple_account_user_split_new(_("Resource"), "Home", '/');