# HG changeset patch # User John Bailey # Date 1227840167 0 # Node ID 8e7e6f60e053192aa434667bde3dcdef2d3a9e70 # Parent 7ec139c84d363d91634fd3bf0affe10fd5bc299d Allow blank resources on XMPP when creating/modifying accounts. This works perfectly with both ejabberd and Google Talk. Other servers should be OK too. diff -r 7ec139c84d36 -r 8e7e6f60e053 libpurple/protocols/jabber/jabber.c --- a/libpurple/protocols/jabber/jabber.c Fri Nov 28 02:19:42 2008 +0000 +++ b/libpurple/protocols/jabber/jabber.c Fri Nov 28 02:42:47 2008 +0000 @@ -702,19 +702,6 @@ return; } - if(!js->user->resource) { - char *me; - js->user->resource = g_strdup("Home"); - if(!js->user->node) { - js->user->node = js->user->domain; - js->user->domain = g_strdup("jabber.org"); - } - me = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain, - js->user->resource); - purple_account_set_username(account, me); - g_free(me); - } - if((my_jb = jabber_buddy_find(js, purple_account_get_username(account), TRUE))) my_jb->subscription |= JABBER_SUB_BOTH; @@ -1182,19 +1169,6 @@ js->write_buffer = purple_circ_buffer_new(512); - if(!js->user->resource) { - char *me; - js->user->resource = g_strdup("Home"); - if(!js->user->node) { - js->user->node = js->user->domain; - js->user->domain = g_strdup("jabber.org"); - } - me = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain, - js->user->resource); - purple_account_set_username(account, me); - g_free(me); - } - if((my_jb = jabber_buddy_find(js, purple_account_get_username(account), TRUE))) my_jb->subscription |= JABBER_SUB_BOTH; diff -r 7ec139c84d36 -r 8e7e6f60e053 libpurple/protocols/jabber/libxmpp.c --- a/libpurple/protocols/jabber/libxmpp.c Fri Nov 28 02:19:42 2008 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Fri Nov 28 02:42:47 2008 +0000 @@ -209,7 +209,7 @@ purple_account_user_split_set_reverse(split, FALSE); prpl_info.user_splits = g_list_append(prpl_info.user_splits, split); - split = purple_account_user_split_new(_("Resource"), "Home", '/'); + split = purple_account_user_split_new(_("Resource"), NULL, '/'); purple_account_user_split_set_reverse(split, FALSE); prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);