diff libpurple/connection.c @ 28285:dab0d17dc6c1

Minor cleanup. gc->prpl is guarranteed to be a PurplePlugin with type PURPLE_PLUGIN_PROTOCOL
author Mark Doliner <mark@kingant.net>
date Tue, 22 Sep 2009 06:01:08 +0000
parents 815d9ce1a8b0
children 378cceb9131d
line wrap: on
line diff
--- a/libpurple/connection.c	Tue Sep 22 02:12:42 2009 +0000
+++ b/libpurple/connection.c	Tue Sep 22 06:01:08 2009 +0000
@@ -52,10 +52,7 @@
 send_keepalive(gpointer data)
 {
 	PurpleConnection *gc = data;
-	PurplePluginProtocolInfo *prpl_info = NULL;
-
-	if (gc == NULL)
-		return TRUE;
+	PurplePluginProtocolInfo *prpl_info;
 
 	/* Only send keep-alives if we haven't heard from the
 	 * server in a while.
@@ -63,12 +60,8 @@
 	if ((time(NULL) - gc->last_received) < KEEPALIVE_INTERVAL)
 		return TRUE;
 
-	if (gc->prpl == NULL)
-		return TRUE;
-
 	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
-
-	if (prpl_info && prpl_info->keepalive)
+	if (prpl_info->keepalive)
 		prpl_info->keepalive(gc);
 
 	return TRUE;