Mercurial > pidgin.yaz
diff libgaim/account.c @ 14607:f23506e8f812
[gaim-migrate @ 17335]
Get rid of some checks to make sure gc is valid. They shouldn't be
necessary (and a lot of them were poorly implemented anyway). Let
me know if you notice any crashes.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Fri, 22 Sep 2006 05:42:01 +0000 |
parents | 60b1bc8dbf37 |
children | 4df2827fc2eb |
line wrap: on
line diff
--- a/libgaim/account.c Thu Sep 21 21:56:19 2006 +0000 +++ b/libgaim/account.c Fri Sep 22 05:42:01 2006 +0000 @@ -1141,11 +1141,8 @@ GaimConnection *gc; gaim_account_set_user_info(account, user_info); - gc = gaim_account_get_connection(account); - - if (gc != NULL) - serv_set_info(gc, user_info); + serv_set_info(gc, user_info); } void @@ -1959,8 +1956,7 @@ if (gc != NULL && gc->prpl != NULL) prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); - if (prpl_info != NULL && g_list_find(gaim_connections_get_all(), gc) && - prpl_info->add_buddy != NULL) + if (prpl_info != NULL && prpl_info->add_buddy != NULL) prpl_info->add_buddy(gc, buddy, gaim_buddy_get_group(buddy)); } @@ -1973,7 +1969,7 @@ if (gc != NULL && gc->prpl != NULL) prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); - if (prpl_info && g_list_find(gaim_connections_get_all(), gc)) { + if (prpl_info) { GList *cur, *groups = NULL; /* Make a list of what group each buddy is in */ @@ -2008,7 +2004,7 @@ if (gc != NULL && gc->prpl != NULL) prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); - if (prpl_info && g_list_find(gaim_connections_get_all(), gc) && prpl_info->remove_buddy) + if (prpl_info && prpl_info->remove_buddy) prpl_info->remove_buddy(gc, buddy, group); } @@ -2018,13 +2014,10 @@ GaimPluginProtocolInfo *prpl_info = NULL; GaimConnection *gc = gaim_account_get_connection(account); - if (!g_list_find(gaim_connections_get_all(), gc)) - return; - if (gc != NULL && gc->prpl != NULL) prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); - if (prpl_info && g_list_find(gaim_connections_get_all(), gc)) { + if (prpl_info) { if (prpl_info->remove_buddies) prpl_info->remove_buddies(gc, buddies, groups); else { @@ -2048,7 +2041,7 @@ if (gc != NULL && gc->prpl != NULL) prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); - if (prpl_info && g_list_find(gaim_connections_get_all(), gc) && prpl_info->remove_group) + if (prpl_info && prpl_info->remove_group) prpl_info->remove_group(gc, group); } @@ -2064,7 +2057,7 @@ if (gc != NULL && gc->prpl != NULL) prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); - if (prpl_info && g_list_find(gaim_connections_get_all(), gc) && prpl_info->change_passwd) + if (prpl_info && prpl_info->change_passwd) prpl_info->change_passwd(gc, orig_pw, new_pw); }