Changeset 21c87a7 for protocols/msn/msn.c
- Timestamp:
- 2010-04-14T09:27:50Z (14 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
protocols/msn/msn.c
r81186cab r21c87a7 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 ); 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 ); 43 40 } 44 41 … … 173 170 static void msn_set_my_name( struct im_connection *ic, char *info ) 174 171 { 175 msn_set_display_name( set_find( &ic->acc->set, "display_name" ), info );172 msn_set_display_name( ic, info ); 176 173 } 177 174 … … 289 286 } 290 287 291 static char * msn_set_display_name( set_t *set, char *value )288 static char *set_eval_display_name( set_t *set, char *value ) 292 289 { 293 290 account_t *acc = set->data; 294 291 struct im_connection *ic = acc->ic; 295 struct msn_data *md; 296 char buf[1024], *fn; 297 298 /* Double-check. */ 292 293 /* Allow any name if we're offline. */ 299 294 if( ic == NULL ) 300 return NULL; 301 302 md = ic->proto_data; 295 return value; 303 296 304 297 if( strlen( value ) > 129 ) … … 307 300 return NULL; 308 301 } 309 310 fn = msn_http_encode( value );311 312 g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->acc->user, fn );313 msn_write( ic, buf, strlen( buf ) );314 g_free( fn );315 302 316 303 /* Returning NULL would be better, because the server still has to 317 304 confirm the name change. However, it looks a bit confusing to the 318 305 user. */ 319 return value;306 return msn_set_display_name( ic, value ) ? value : NULL; 320 307 } 321 308
Note: See TracChangeset
for help on using the changeset viewer.