Changes in protocols/msn/msn.c [9bf2481:e3413cc]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/msn/msn.c
r9bf2481 re3413cc 31 31 GSList *msn_switchboards; 32 32 33 static char * msn_set_display_name( set_t *set, char *value );33 static char *set_eval_display_name( set_t *set, char *value ); 34 34 35 35 static void msn_init( account_t *acc ) 36 36 { 37 set_t *s; 38 39 s = set_add( &acc->set, "display_name", NULL, msn_set_display_name, acc ); 40 s->flags |= ACC_SET_NOSAVE | ACC_SET_ONLINE_ONLY; 41 42 s = set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc ); 43 44 s = set_add( &acc->set, "switchboard_keepalives", "false", set_eval_bool, acc ); 37 set_add( &acc->set, "display_name", NULL, set_eval_display_name, acc ); 38 set_add( &acc->set, "local_display_name", "false", set_eval_bool, acc ); 39 set_add( &acc->set, "mail_notifications", "false", set_eval_bool, acc ); 45 40 } 46 41 … … 169 164 static void msn_set_my_name( struct im_connection *ic, char *info ) 170 165 { 171 msn_set_display_name( set_find( &ic->acc->set, "display_name" ), info );166 msn_set_display_name( ic, info ); 172 167 } 173 168 … … 285 280 } 286 281 287 static char * msn_set_display_name( set_t *set, char *value )282 static char *set_eval_display_name( set_t *set, char *value ) 288 283 { 289 284 account_t *acc = set->data; 290 285 struct im_connection *ic = acc->ic; 291 struct msn_data *md; 292 char buf[1024], *fn; 293 294 /* Double-check. */ 286 287 /* Allow any name if we're offline. */ 295 288 if( ic == NULL ) 296 return NULL; 297 298 md = ic->proto_data; 289 return value; 299 290 300 291 if( strlen( value ) > 129 ) … … 303 294 return NULL; 304 295 } 305 306 fn = msn_http_encode( value );307 308 g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->acc->user, fn );309 msn_write( ic, buf, strlen( buf ) );310 g_free( fn );311 296 312 297 /* Returning NULL would be better, because the server still has to 313 298 confirm the name change. However, it looks a bit confusing to the 314 299 user. */ 315 return value;300 return msn_set_display_name( ic, value ) ? value : NULL; 316 301 } 317 302
Note: See TracChangeset
for help on using the changeset viewer.