Changes in / [d2b3f25:fef97af]

Files:

• dcc.c (modified) (1 diff)
• lib/ftutil.c (modified) (1 diff)
• lib/http_client.c (modified) (1 diff)
• protocols/jabber/s5bytestream.c (modified) (1 diff)
• protocols/jabber/si.c (modified) (1 diff)

dcc.c

@@ -385 +385 @@
                                 b_event_remove( df->watch_out );
 
-                        df->watch_in = 0;
-
                         if( df->proto_finished )
                                 dcc_finish( ft );
 
+                        df->watch_in = 0;
                         return FALSE;
                 }

lib/ftutil.c

@@ -138 +138 @@
 
         /* I hate static-length strings.. */
-        host[HOST_NAME_MAX-1] = '\0';
+        host[HOST_NAME_MAX] = '\0';
         port[5] = '\0';
         

lib/http_client.c

@@ -211 +211 @@
         
         if( req->inpa > 0 )
-        {
                 b_event_remove( req->inpa );
-                req->inpa = 0;
-        }
         
         if( req->ssl )

protocols/jabber/s5bytestream.c

@@ -123 +123 @@
 
         if ( tf->watch_in )
-        {
                 b_event_remove( tf->watch_in );
-                tf->watch_in = 0;
-        }
         
         if( tf->watch_out )
-        {
                 b_event_remove( tf->watch_out );
-                tf->watch_out = 0;
-        }
         
         g_free( bt->pseudoadr );

protocols/jabber/si.c

@@ -35 +35 @@
 
         if ( tf->watch_in )
-        {
                 b_event_remove( tf->watch_in );
-                tf->watch_in = 0;
-        }
 
         jd->filetransfers = g_slist_remove( jd->filetransfers, tf );