Changes in protocols/msn/msn_util.c [e3413cc:9143aeb]

File:

• protocols/msn/msn_util.c (modified) (3 diffs)

protocols/msn/msn_util.c

@@ -38 +38 @@
                 imcb_error( ic, "Short write() to main server" );
                 imc_logout( ic, TRUE );
-                return 0;
-        }
-        
-        return 1;
+                return( 0 );
+        }
+        
+        return( 1 );
 }
 
@@ -171 +171 @@
                 
                 /* End of headers? */
-                if( ( i >= 4 && strncmp( text + i - 4, "\r\n\r\n", 4 ) == 0 ) ||
-                    ( i >= 2 && ( strncmp( text + i - 2, "\n\n", 2 ) == 0 ||   
-                                  strncmp( text + i - 2, "\r\r", 2 ) == 0 ) ) )
+                if( strncmp( text + i - 2, "\n\n", 2 ) == 0 ||
+                    strncmp( text + i - 4, "\r\n\r\n", 4 ) == 0 ||
+                    strncmp( text + i - 2, "\r\r", 2 ) == 0 )
                 {
                         break;
@@ -374 +374 @@
         *list = NULL;
         
-        imcb_log( ic, "%s", ret->str );
+        imcb_log( ic, ret->str );
         g_string_free( ret, TRUE );
 }
-
-gboolean msn_set_display_name( struct im_connection *ic, const char *rawname )
-{
-        char *fn = msn_http_encode( rawname );
-        struct msn_data *md = ic->proto_data;
-        char buf[1024];
-        
-        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->acc->user, fn );
-        g_free( fn );
-        
-        return msn_write( ic, buf, strlen( buf ) ) != 0;
-}