[Gaim-commits] SF.net SVN: gaim: [17793] trunk/libgaim

[<sea...@us...>]

Revision: 17793
          http://svn.sourceforge.net/gaim/?rev=17793&view=rev
Author:   seanegan
Date:     2006-11-20 14:39:08 -0800 (Mon, 20 Nov 2006)

Log Message:
-----------
I think that setting info on connection is an AIM-specific thing. Jabber, at least,
has the server save the vcard and you should only set it when it changes. Setting
it on connection can break things.

If you know another protocol that requires info to be set on connection, please
add it to that prpl.

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

Modified: trunk/libgaim/connection.c
===================================================================
--- trunk/libgaim/connection.c	2006-11-20 22:00:31 UTC (rev 17792)
+++ trunk/libgaim/connection.c	2006-11-20 22:39:08 UTC (rev 17793)
@@ -309,9 +309,6 @@
 		serv_set_permit_deny(gc);
 
 		update_keepalive(gc, TRUE);
-
-		if (gaim_account_get_user_info(account) != NULL)
-			serv_set_info(gc, gaim_account_get_user_info(account));
 	}
 	else if (gc->state == GAIM_DISCONNECTED) {
 		GaimAccount *account = gaim_connection_get_account(gc);

Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c	2006-11-20 22:00:31 UTC (rev 17792)
+++ trunk/libgaim/protocols/oscar/oscar.c	2006-11-20 22:39:08 UTC (rev 17793)
@@ -3533,6 +3533,9 @@
 
 	aim_clientready(od, conn);
 
+        if (gaim_account_get_user_info(account) != NULL)
+        	serv_set_info(gc, gaim_account_get_user_info(account));
+	
 	/* Set our available message based on the current status */
 	status = gaim_account_get_active_status(account);
 	if (gaim_status_is_available(status))


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