Mercurial > pidgin.yaz

comparison src/protocols/jabber/jabber.c @ 7147:e9867cdeb0fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 7714] better fix for you poor slobs that haven't edited your account in a while committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Sat, 04 Oct 2003 21:53:11 +0000
parents 0e4894b3e2a6
children 4200828dc06c
comparison
equal deleted inserted replaced
7146:875303d4f004 7147:e9867cdeb0fd
355 g_free, (GDestroyNotify)jabber_buddy_free); 355 g_free, (GDestroyNotify)jabber_buddy_free);
356 js->chats = g_hash_table_new_full(g_str_hash, g_str_equal, 356 js->chats = g_hash_table_new_full(g_str_hash, g_str_equal,
357 g_free, NULL); 357 g_free, NULL);
358 js->user = jabber_id_new(gaim_account_get_username(account)); 358 js->user = jabber_id_new(gaim_account_get_username(account));
359 359
360 if(!js->user->node) { 360 if(!js->user->resource) {
361 js->user->node = js->user->domain; 361 char *me;
362 js->user->domain = g_strdup("jabber.org");
363 }
364 if(!js->user->resource)
365 js->user->resource = g_strdup("Gaim"); 362 js->user->resource = g_strdup("Gaim");
363 if(!js->user->node) {
364 js->user->node = js->user->domain;
365 js->user->domain = g_strdup("jabber.org");
366 }
367 me = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain,
368 js->user->resource);
369 gaim_account_set_username(account, me);
370 g_free(me);
371 }
366 372
367 server = connect_server[0] ? connect_server : js->user->domain; 373 server = connect_server[0] ? connect_server : js->user->domain;
368 374
369 jabber_stream_set_state(js, JABBER_STREAM_CONNECTING); 375 jabber_stream_set_state(js, JABBER_STREAM_CONNECTING);
370 376
625 js->gc = gc; 631 js->gc = gc;
626 js->registration = TRUE; 632 js->registration = TRUE;
627 js->callbacks = g_hash_table_new_full(g_str_hash, g_str_equal, 633 js->callbacks = g_hash_table_new_full(g_str_hash, g_str_equal,
628 g_free, NULL); 634 g_free, NULL);
629 js->user = jabber_id_new(gaim_account_get_username(account)); 635 js->user = jabber_id_new(gaim_account_get_username(account));
636
637 if(!js->user->resource) {
638 char *me;
639 js->user->resource = g_strdup("Gaim");
640 if(!js->user->node) {
641 js->user->node = js->user->domain;
642 js->user->domain = g_strdup("jabber.org");
643 }
644 me = g_strdup_printf("%s@%s/%s", js->user->node, js->user->domain,
645 js->user->resource);
646 gaim_account_set_username(account, me);
647 g_free(me);
648 }
630 649
631 server = connect_server[0] ? connect_server : js->user->domain; 650 server = connect_server[0] ? connect_server : js->user->domain;
632 651
633 jabber_stream_set_state(js, JABBER_STREAM_CONNECTING); 652 jabber_stream_set_state(js, JABBER_STREAM_CONNECTING);
634 653