Small code cleanup, got rid of some functions in nogaim.c that we never needed.

2 files changed, 6 insertions, 31 deletions

diff --git a/protocols/nogaim.c b/protocols/nogaim.c
index 29ae860a..b0c357db 100644
--- a/protocols/nogaim.c
+++ b/protocols/nogaim.c
@@ -13,7 +13,7 @@
  * from scratch for BitlBee and doesn't contain any code from Gaim anymore
  * (except for the function names).
  *
- * Copyright 2002-2004 Wilmer van der Gaast <lintux@lintux.cx>
+ * Copyright 2002-2006 Wilmer van der Gaast <wilmer@gaast.net> and others
  */
 
 /*
@@ -351,7 +351,7 @@ void account_online( struct gaim_connection *gc )
 	user_t *u;
 	
 	/* MSN servers sometimes redirect you to a different server and do
-	   the whole login sequence again, so subsequent calls to this
+	   the whole login sequence again, so these "late" calls to this
 	   function should be handled correctly. (IOW, ignored) */
 	if( gc->flags & OPT_LOGGED_IN )
 		return;
@@ -365,7 +365,7 @@ void account_online( struct gaim_connection *gc )
 	
 	if( u && u->away ) proto_away( gc, u->away );
 	
- 	if( !strcmp(gc->prpl->name, "icq") )
+ 	if( strcmp( gc->prpl->name, "ICQ" ) == 0 )
 	{
 		for( u = gc->irc->users; u; u = u->next )
 			if( u->gc == gc )
@@ -469,16 +469,6 @@ void do_ask_dialog( struct gaim_connection *gc, char *msg, void *data, void *doi
 
 /* list.c */
 
-int bud_list_cache_exists( struct gaim_connection *gc )
-{
-	return( 0 );
-}
-
-void do_import( struct gaim_connection *gc, void *null )
-{
-	return;
-}
-
 void add_buddy( struct gaim_connection *gc, char *group, char *handle, char *realname )
 {
 	user_t *u;
@@ -553,11 +543,6 @@ struct buddy *find_buddy( struct gaim_connection *gc, char *handle )
 	return( b );
 }
 
-void do_export( struct gaim_connection *gc )
-{
-	return;
-}
-
 void signoff_blocked( struct gaim_connection *gc )
 {
 	return; /* Make all blocked users look invisible (TODO?) */
@@ -883,11 +868,6 @@ struct conversation *serv_got_joined_chat( struct gaim_connection *gc, int id, c
 	return( c );
 }
 
-void serv_finish_login( struct gaim_connection *gc )
-{
-	return;
-}
-
 
 /* buddy_chat.c */
 
diff --git a/protocols/oscar/oscar.c b/protocols/oscar/oscar.c
index 4e552bce..7f5c0fc3 100644
--- a/protocols/oscar/oscar.c
+++ b/protocols/oscar/oscar.c
@@ -355,7 +355,9 @@ static void oscar_login(struct aim_user *user) {
 
 	if (isdigit(*user->username)) {
 		odata->icq = TRUE;
-		/* this is odd but it's necessary for a proper do_import and do_export */
+		/* This is odd but it's necessary for a proper do_import and do_export.
+		   We don't do those anymore, but let's stick with it, just in case
+		   it accidentally fixes something else too... */
 		gc->password[8] = 0;
 	} else {
 		gc->flags |= OPT_CONN_HTML;
@@ -1736,11 +1738,6 @@ static int gaim_bosrights(aim_session_t *sess, aim_frame_t *fr, ...) {
 	odata->rights.maxpermits = (guint)maxpermits;
 	odata->rights.maxdenies = (guint)maxdenies;
 
-//	serv_finish_login(gc);
-
-	if (bud_list_cache_exists(gc))
-		do_import(gc, NULL);
-
 	aim_clientready(sess, fr->conn);
 
 	aim_reqservice(sess, fr->conn, AIM_CONN_TYPE_CHATNAV);
@@ -2095,8 +2092,6 @@ static int gaim_ssi_parselist(aim_session_t *sess, aim_frame_t *fr, ...) {
 		} /* End of switch on curitem->type */
 	} /* End of for loop */
 
-	if (tmp)
-		do_export(gc);
 	aim_ssi_enable(sess, fr->conn);
 	
 	/* Request offline messages, now that the buddy list is complete. */