pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [17202] trunk/libgaim/connection.c

[<dat...@us...>]

Revision: 17202
          http://svn.sourceforge.net/gaim/?rev=17202&view=rev
Author:   datallah
Date:     2006-09-09 12:41:34 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
Don't register the connection keepalive timer if the prpl doesn't support keepalives

Modified Paths:
--------------
    trunk/libgaim/connection.c

Modified: trunk/libgaim/connection.c
===================================================================
--- trunk/libgaim/connection.c	2006-09-09 19:39:31 UTC (rev 17201)
+++ trunk/libgaim/connection.c	2006-09-09 19:41:34 UTC (rev 17202)
@@ -61,6 +61,14 @@
 static void
 update_keepalive(GaimConnection *gc, gboolean on)
 {
+	GaimPluginProtocolInfo *prpl_info = NULL;
+
+	if (gc != NULL && gc->prpl != NULL)
+		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+
+	if (!prpl_info || !prpl_info->keepalive)
+		return;
+
 	if (on && !gc->keepalive)
 	{
 		gaim_debug_info("connection", "Activating keepalive.\n");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17607] trunk/libgaim/connection.c

[<the...@us...>]

Revision: 17607
          http://svn.sourceforge.net/gaim/?rev=17607&view=rev
Author:   thekingant
Date:     2006-10-28 13:05:27 -0700 (Sat, 28 Oct 2006)

Log Message:
-----------
I don't believe this check is needed

Modified Paths:
--------------
    trunk/libgaim/connection.c

Modified: trunk/libgaim/connection.c
===================================================================
--- trunk/libgaim/connection.c	2006-10-28 20:04:03 UTC (rev 17606)
+++ trunk/libgaim/connection.c	2006-10-28 20:05:27 UTC (rev 17607)
@@ -31,6 +31,7 @@
 #include "log.h"
 #include "notify.h"
 #include "prefs.h"
+#include "proxy.h"
 #include "request.h"
 #include "server.h"
 #include "signals.h"
@@ -188,13 +189,11 @@
 
 	update_keepalive(gc, FALSE);
 
-	if (gc->prpl != NULL)
-	{
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+	gaim_proxy_connect_cancel_with_handle(gc);
 
-		if (prpl_info->close)
-			(prpl_info->close)(gc);
-	}
+	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+	if (prpl_info->close)
+		(prpl_info->close)(gc);
 
 	/* Clear out the proto data that was freed in the prpl close method*/
 	buddies = gaim_find_buddies(account, NULL);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.