Changeset ae3dc99 for protocols/msn/msn_util.c

Timestamp:

2010-04-24T17:02:07Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c521362

Parents:

b5b40ff (diff), f1b7711 (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 stuff from mainline (1.2.6).

File:

• protocols/msn/msn_util.c (modified) (2 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;
 }
 
@@ -377 +377 @@
         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;
+}