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