Mercurial > pidgin

comparison libpurple/protocols/mxit/mxit.c @ 31904:3322201b446f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
I went through all our calls to purple_notify_user_info_add_pair() and checked whether they should be purple_notify_user_info_add_pair_plaintext(), instead. If it wasn't immediately obvious one way or the other then I left a comment to investigate. I suspect there are still a lot of places where we should use the _plaintext function to escape the value.
author Mark Doliner <mark@kingant.net>
date Mon, 22 Aug 2011 01:53:37 +0000
parents 93cb9f408df4
children 99ca503ea087
comparison
equal deleted inserted replaced
31903:57d43a9a4e7e 31904:3322201b446f
338 if ( !contact ) 338 if ( !contact )
339 return; 339 return;
340 340
341 /* status (reference: "libpurple/notify.h") */ 341 /* status (reference: "libpurple/notify.h") */
342 if ( contact->presence != MXIT_PRESENCE_OFFLINE ) 342 if ( contact->presence != MXIT_PRESENCE_OFFLINE )
343 purple_notify_user_info_add_pair( info, _( "Status" ), mxit_convert_presence_to_name( contact->presence ) ); 343 purple_notify_user_info_add_pair_plaintext( info, _( "Status" ), mxit_convert_presence_to_name( contact->presence ) );
344 344
345 /* status message */ 345 /* status message */
346 if ( contact->statusMsg ) 346 if ( contact->statusMsg ) {
347 /* TODO: Check whether it's correct to call add_pair_html,
348 or if we should be using add_pair_plaintext */
347 purple_notify_user_info_add_pair( info, _( "Status Message" ), contact->statusMsg ); 349 purple_notify_user_info_add_pair( info, _( "Status Message" ), contact->statusMsg );
350 }
348 351
349 /* mood */ 352 /* mood */
350 if ( contact->mood != MXIT_MOOD_NONE ) 353 if ( contact->mood != MXIT_MOOD_NONE )
351 purple_notify_user_info_add_pair( info, _( "Mood" ), mxit_convert_mood_to_name( contact->mood ) ); 354 purple_notify_user_info_add_pair_plaintext( info, _( "Mood" ), mxit_convert_mood_to_name( contact->mood ) );
352 355
353 /* subscription type */ 356 /* subscription type */
354 if ( contact->subtype != 0 ) 357 if ( contact->subtype != 0 )
355 purple_notify_user_info_add_pair( info, _( "Subscription" ), mxit_convert_subtype_to_name( contact->subtype ) ); 358 purple_notify_user_info_add_pair_plaintext( info, _( "Subscription" ), mxit_convert_subtype_to_name( contact->subtype ) );
356 359
357 /* rejection message */ 360 /* rejection message */
358 if ( ( contact->subtype == MXIT_SUBTYPE_REJECTED ) && ( contact->msg != NULL ) ) 361 if ( ( contact->subtype == MXIT_SUBTYPE_REJECTED ) && ( contact->msg != NULL ) ) {
362 /* TODO: Check whether it's correct to call add_pair_html,
363 or if we should be using add_pair_plaintext */
359 purple_notify_user_info_add_pair( info, _( "Rejection Message" ), contact->msg ); 364 purple_notify_user_info_add_pair( info, _( "Rejection Message" ), contact->msg );
365 }
360 } 366 }
361 367
362 368
363 /*------------------------------------------------------------------------ 369 /*------------------------------------------------------------------------
364 * Initiate the logout sequence, close the connection and clear the session data. 370 * Initiate the logout sequence, close the connection and clear the session data.