Changeset 84c1a0a

Timestamp:

2006-03-15T19:19:16Z (19 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

8ba511d

Parents:

58f3136

Message:

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

Files:

• ipc.c (modified) (1 diff)
• protocols/nogaim.c (modified) (6 diffs)
• protocols/oscar/oscar.c (modified) (3 diffs)

ipc.c

@@ -84 +84 @@
 void ipc_master_cmd_restart( irc_t *data, char **cmd )
 {
-        struct bitlbee_child *child = (void*) data;
-        
         if( global.conf->runmode != RUNMODE_FORKDAEMON )
         {

protocols/nogaim.c

@@ -14 +14 @@
  * (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
  */
 
@@ -352 +352 @@
         
         /* 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 )
@@ -366 +366 @@
         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 )
@@ -470 +470 @@
 /* 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 )
 {
@@ -552 +542 @@
         
         return( b );
-}
-
-void do_export( struct gaim_connection *gc )
-{
-        return;
 }
 
@@ -882 +867 @@
         
         return( c );
-}
-
-void serv_finish_login( struct gaim_connection *gc )
-{
-        return;
 }
 

protocols/oscar/oscar.c

@@ -356 +356 @@
         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 {
@@ -1737 +1739 @@
         odata->rights.maxdenies = (guint)maxdenies;
 
-//      serv_finish_login(gc);
-
-        if (bud_list_cache_exists(gc))
-                do_import(gc, NULL);
-
         aim_clientready(sess, fr->conn);
 
@@ -2096 +2093 @@
         } /* End of for loop */
 
-        if (tmp)
-                do_export(gc);
         aim_ssi_enable(sess, fr->conn);