Mercurial > pidgin.yaz

diff libgaim/server.c @ 14607:f23506e8f812

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 aee74d84816c
children 0a9c44ce9a4a
line wrap: on
line diff
--- a/libgaim/server.c	Thu Sep 21 21:56:19 2006 +0000
+++ b/libgaim/server.c	Fri Sep 22 05:42:01 2006 +0000
@@ -173,8 +173,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->set_info) {
+	if (prpl_info && prpl_info->set_info) {
 
 		account = gaim_connection_get_account(gc);
 
@@ -270,7 +269,7 @@
 	if (g != NULL && g->prpl != NULL)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl);
 
-	if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->add_permit)
+	if (prpl_info && prpl_info->add_permit)
 		prpl_info->add_permit(g, name);
 }
 
@@ -281,7 +280,7 @@
 	if (g != NULL && g->prpl != NULL)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl);
 
-	if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->add_deny)
+	if (prpl_info && prpl_info->add_deny)
 		prpl_info->add_deny(g, name);
 }
 
@@ -292,7 +291,7 @@
 	if (g != NULL && g->prpl != NULL)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl);
 
-	if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->rem_permit)
+	if (prpl_info && prpl_info->rem_permit)
 		prpl_info->rem_permit(g, name);
 }
 
@@ -303,7 +302,7 @@
 	if (g != NULL && g->prpl != NULL)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl);
 
-	if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->rem_deny)
+	if (prpl_info && prpl_info->rem_deny)
 		prpl_info->rem_deny(g, name);
 }
 
@@ -320,7 +319,7 @@
 	 * in the prefs. In either case you should probably be resetting and
 	 * resending the permit/deny info when you get this.
 	 */
-	if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->set_permit_deny)
+	if (prpl_info && prpl_info->set_permit_deny)
 		prpl_info->set_permit_deny(g);
 }
 
@@ -331,7 +330,7 @@
 	if (g != NULL && g->prpl != NULL)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl);
 
-	if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->join_chat)
+	if (prpl_info && prpl_info->join_chat)
 		prpl_info->join_chat(g, data);
 }
 
@@ -343,7 +342,7 @@
 	if (g != NULL && g->prpl != NULL)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl);
 
-	if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->reject_chat)
+	if (prpl_info && prpl_info->reject_chat)
 		prpl_info->reject_chat(g, data);
 }
 
@@ -364,7 +363,7 @@
 	gaim_signal_emit(gaim_conversations_get_handle(), "chat-inviting-user",
 					 conv, name, &buffy);
 
-	if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->chat_invite)
+	if (prpl_info && prpl_info->chat_invite)
 		prpl_info->chat_invite(g, id, buffy, name);
 
 	gaim_signal_emit(gaim_conversations_get_handle(), "chat-invited-user",
@@ -383,9 +382,6 @@
 {
 	GaimPluginProtocolInfo *prpl_info = NULL;
 
-	if (!g_list_find(gaim_connections_get_all(), g))
-		return;
-
 	if (g->prpl != NULL)
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl);