Changeset 814aa52 for protocols/msn/msn.c
- Timestamp:
- 2010-06-03T11:00:45Z (14 years ago)
- Branches:
- master
- Children:
- a6b2f13
- Parents:
- 5f8ab6a9 (diff), f4bcc22 (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
r5f8ab6a9 r814aa52 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 … … 167 165 static void msn_set_my_name( struct im_connection *ic, char *info ) 168 166 { 169 msn_set_display_name( set_find( &ic->acc->set, "display_name" ), info );167 msn_set_display_name( ic, info ); 170 168 } 171 169 … … 283 281 } 284 282 285 static char * msn_set_display_name( set_t *set, char *value )283 static char *set_eval_display_name( set_t *set, char *value ) 286 284 { 287 285 account_t *acc = set->data; 288 286 struct im_connection *ic = acc->ic; 289 struct msn_data *md; 290 char buf[1024], *fn; 291 292 /* Double-check. */ 287 288 /* Allow any name if we're offline. */ 293 289 if( ic == NULL ) 294 return NULL; 295 296 md = ic->proto_data; 290 return value; 297 291 298 292 if( strlen( value ) > 129 ) … … 301 295 return NULL; 302 296 } 303 304 fn = msn_http_encode( value );305 306 g_snprintf( buf, sizeof( buf ), "REA %d %s %s\r\n", ++md->trId, ic->acc->user, fn );307 msn_write( ic, buf, strlen( buf ) );308 g_free( fn );309 297 310 298 /* Returning NULL would be better, because the server still has to 311 299 confirm the name change. However, it looks a bit confusing to the 312 300 user. */ 313 return value;301 return msn_set_display_name( ic, value ) ? value : NULL; 314 302 } 315 303
Note: See TracChangeset
for help on using the changeset viewer.