Mercurial > pidgin
comparison libpurple/protocols/msn/user.c @ 26987:cd78ea46e9bd
merge of '7c614b09b72037ebd86c03fbbeac7794a155547b'
and 'af18689b86389686230fc6ce83cbba52690ce0cb'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 30 May 2009 00:32:50 +0000 |
| parents | 2a95e8bd9b80 |
| children | 95cc20ede768 d213c8ad89da |
comparison
equal
deleted
inserted
replaced
| 26986:42bff519973b | 26987:cd78ea46e9bd |
|---|---|
| 72 g_free(user->phone.mobile); | 72 g_free(user->phone.mobile); |
| 73 g_free(user->media.artist); | 73 g_free(user->media.artist); |
| 74 g_free(user->media.title); | 74 g_free(user->media.title); |
| 75 g_free(user->media.album); | 75 g_free(user->media.album); |
| 76 g_free(user->statusline); | 76 g_free(user->statusline); |
| 77 g_free(user->invite_message); | |
| 77 | 78 |
| 78 g_free(user); | 79 g_free(user); |
| 79 } | 80 } |
| 80 | 81 |
| 81 void | 82 void |
| 424 g_hash_table_destroy(user->clientcaps); | 425 g_hash_table_destroy(user->clientcaps); |
| 425 | 426 |
| 426 user->clientcaps = info; | 427 user->clientcaps = info; |
| 427 } | 428 } |
| 428 | 429 |
| 430 void | |
| 431 msn_user_set_invite_message(MsnUser *user, const char *message) | |
| 432 { | |
| 433 g_return_if_fail(user != NULL); | |
| 434 | |
| 435 g_free(user->invite_message); | |
| 436 user->invite_message = g_strdup(message); | |
| 437 } | |
| 438 | |
| 429 const char * | 439 const char * |
| 430 msn_user_get_passport(const MsnUser *user) | 440 msn_user_get_passport(const MsnUser *user) |
| 431 { | 441 { |
| 432 g_return_val_if_fail(user != NULL, NULL); | 442 g_return_val_if_fail(user != NULL, NULL); |
| 433 | 443 |
| 487 { | 497 { |
| 488 g_return_val_if_fail(user != NULL, NULL); | 498 g_return_val_if_fail(user != NULL, NULL); |
| 489 | 499 |
| 490 return user->clientcaps; | 500 return user->clientcaps; |
| 491 } | 501 } |
| 502 | |
| 503 const char * | |
| 504 msn_user_get_invite_message(const MsnUser *user) | |
| 505 { | |
| 506 g_return_val_if_fail(user != NULL, NULL); | |
| 507 | |
| 508 return user->invite_message; | |
| 509 } | |
| 510 |
