comparison libpurple/protocols/gg/gg.c @ 25288:da46097b4722

propagate from branch 'local.struct.hiding' (head da9fb6ccb9b3d723d8abdfaae8859bae223cf225) to branch 'local.next.minor' (head bd7ae6d940b09aa836bd22be2c6c5b22bfbf4312)
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 31 Oct 2008 08:21:45 +0000
parents 4d20fa86455b 5ace6c024230
children d93c93dfa435
comparison
equal deleted inserted replaced
25287:de22f550bae2 25288:da46097b4722
419 * new username and etc, we need to somehow have it refresh at this 419 * new username and etc, we need to somehow have it refresh at this
420 * point 420 * point
421 */ 421 */
422 422
423 /* Need to disconnect or actually log in. For now, we disconnect. */ 423 /* Need to disconnect or actually log in. For now, we disconnect. */
424 purple_connection_destroy(gc); 424 purple_account_disconnect(account);
425 425
426 exit_err: 426 exit_err:
427 if(account->registration_cb) 427 if(account->registration_cb)
428 (account->registration_cb)(account, FALSE, account->registration_cb_user_data); 428 (account->registration_cb)(account, FALSE, account->registration_cb_user_data);
429 429
444 PurpleRequestFields *fields) 444 PurpleRequestFields *fields)
445 { 445 {
446 GGPInfo *info = gc->proto_data; 446 GGPInfo *info = gc->proto_data;
447 GGPToken *token = info->token; 447 GGPToken *token = info->token;
448 448
449 purple_connection_destroy(gc); 449 purple_account_disconnect(gc->account);
450 450
451 g_free(token->id); 451 g_free(token->id);
452 g_free(token->data); 452 g_free(token->data);
453 g_free(token); 453 g_free(token);
454 454
1905 /* static void ggp_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) {{{ */ 1905 /* static void ggp_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) {{{ */
1906 static void ggp_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group) 1906 static void ggp_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
1907 { 1907 {
1908 PurpleAccount *account; 1908 PurpleAccount *account;
1909 GGPInfo *info = gc->proto_data; 1909 GGPInfo *info = gc->proto_data;
1910 const gchar *name = purple_buddy_get_name(buddy); 1910 const char *name = purple_buddy_get_name(buddy);
1911 1911
1912 gg_add_notify(info->session, ggp_str_to_uin(name)); 1912 gg_add_notify(info->session, ggp_str_to_uin(name));
1913 1913
1914 account = purple_connection_get_account(gc); 1914 account = purple_connection_get_account(gc);
1915 if (strcmp(purple_account_get_username(account), name) == 0) { 1915 if (strcmp(purple_account_get_username(account), name) == 0) {