Changeset b8c2ace

Timestamp:

2006-01-19T22:24:25Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

55ec2d6

Parents:

5424c76 (diff), 2fa825b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Die, bug, die! (And apparently bzr suddenly felt like merging some old commits...)

Files:

• irc.c (modified) (1 diff)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/oscar/oscar.c (modified) (1 diff)
• protocols/oscar/rxqueue.c (modified) (1 diff)
• protocols/yahoo/yahoo.c (modified) (2 diffs)

irc.c

@@ -750 +750 @@
                 }
                 irc_reply( irc, 376, ":End of MOTD" );
-                closesocket( fd );
+                close( fd );
         }
 }

protocols/jabber/jabber.c

@@ -413 +413 @@
                 if (jd->die)
                         signoff(GJ_GC(gjc));
-        } else if (len < 0 || errno != EAGAIN) {
+        } else if (len == 0 || (len < 0 && (!sockerr_again() || gjc->ssl))) {
                 STATE_EVT(JCONN_STATE_OFF)
         }

protocols/oscar/oscar.c

@@ -608 +608 @@
                 return;
         }
+        /* [WvG] Wheeeee! Who needs error checking anyway? ;-) */
         read(pos->fd, m, 16);
         m[16] = '\0';

protocols/oscar/rxqueue.c

@@ -353 +353 @@
                 return -1; /* its a aim_conn_close()'d connection */
 
-        if (conn->fd < 3)  /* can happen when people abuse the interface */
+        /* KIDS, THIS IS WHAT HAPPENS IF YOU USE CODE WRITTEN FOR GUIS IN A DAEMON!
+           
+           And wouldn't it make sense to return something that prevents this function
+           from being called again IMMEDIATELY (and making the program suck up all
+           CPU time)?...
+           
+        if (conn->fd < 3)
                 return 0;
+        */
 
         if (conn->status & AIM_CONN_STATUS_INPROGRESS)

protocols/yahoo/yahoo.c

@@ -189 +189 @@
 {
         struct byahoo_data *yd = (struct byahoo_data *) gc->proto_data;
-
+        
         gc->away = NULL;
-
-        if (msg)
+        
+        if( msg )
         {
                 yd->current_status = YAHOO_STATUS_CUSTOM;
                 gc->away = "";
         }
-        else if (state)
+        if( state )
         {
                 gc->away = "";
-                if( g_strcasecmp(state, "Available" ) == 0 )
+                if( g_strcasecmp( state, "Available" ) == 0 )
                 {
                         yd->current_status = YAHOO_STATUS_AVAILABLE;
@@ -235 +235 @@
                 }
         }
-        else if ( gc->is_idle )
+        else if( gc->is_idle )
                 yd->current_status = YAHOO_STATUS_IDLE;
         else
                 yd->current_status = YAHOO_STATUS_AVAILABLE;
         
-        yahoo_set_away( yd->y2_id, yd->current_status, msg, gc->away != NULL );
+        if( yd->current_status == YAHOO_STATUS_INVISIBLE )
+                yahoo_set_away( yd->y2_id, yd->current_status, NULL, gc->away != NULL );
+        else
+                yahoo_set_away( yd->y2_id, yd->current_status, msg, gc->away != NULL );
 }