Ignore:
Timestamp:
2010-04-14T09:27:50Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
d33679e
Parents:
81186cab (diff), 156bbd7 (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:

Merging loads of stuff from mainline.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/msn/msn_util.c

    r81186cab r21c87a7  
    3838                imcb_error( ic, "Short write() to main server" );
    3939                imc_logout( ic, TRUE );
    40                 return( 0 );
    41         }
    42        
    43         return( 1 );
     40                return 0;
     41        }
     42       
     43        return 1;
    4444}
    4545
     
    376376        g_string_free( ret, TRUE );
    377377}
     378
     379gboolean msn_set_display_name( struct im_connection *ic, const char *rawname )
     380{
     381        char *fn = msn_http_encode( rawname );
     382        struct msn_data *md = ic->proto_data;
     383        char buf[1024];
     384       
     385        g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->acc->user, fn );
     386        g_free( fn );
     387       
     388        return msn_write( ic, buf, strlen( buf ) ) != 0;
     389}
Note: See TracChangeset for help on using the changeset viewer.