Mercurial > pidgin
comparison libpurple/protocols/msn/user.c @ 21284:6de09629f091
propagate from branch 'im.pidgin.pidgin.next.minor' (head 0c9637482b845cc65e95a26e144697391c51133f)
to branch 'im.pidgin.pidgin' (head e3a6991e78dac328f13804950fee54dfb8afc3c5)
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Sat, 10 Nov 2007 04:52:20 +0000 |
| parents | 5913725cbcd6 c8f99cb61dc9 |
| children | c80d0732fa40 |
comparison
equal
deleted
inserted
replaced
| 21283:406aa3be6b32 | 21284:6de09629f091 |
|---|---|
| 390 | 390 |
| 391 if (l == NULL) | 391 if (l == NULL) |
| 392 return; | 392 return; |
| 393 | 393 |
| 394 g_free(l->data); | 394 g_free(l->data); |
| 395 user->group_ids = g_list_remove_link(user->group_ids, l); | 395 user->group_ids = g_list_delete_link(user->group_ids, l); |
| 396 } | 396 } |
| 397 | 397 |
| 398 void | 398 void |
| 399 msn_user_set_home_phone(MsnUser *user, const char *number) | 399 msn_user_set_home_phone(MsnUser *user, const char *number) |
| 400 { | 400 { |
| 401 g_return_if_fail(user != NULL); | 401 g_return_if_fail(user != NULL); |
| 402 | 402 |
| 403 if (user->phone.home != NULL) | 403 g_free(user->phone.home); |
| 404 g_free(user->phone.home); | 404 user->phone.home = g_strdup(number); |
| 405 | |
| 406 user->phone.home = (number == NULL ? NULL : g_strdup(number)); | |
| 407 } | 405 } |
| 408 | 406 |
| 409 void | 407 void |
| 410 msn_user_set_work_phone(MsnUser *user, const char *number) | 408 msn_user_set_work_phone(MsnUser *user, const char *number) |
| 411 { | 409 { |
| 412 g_return_if_fail(user != NULL); | 410 g_return_if_fail(user != NULL); |
| 413 | 411 |
| 414 if (user->phone.work != NULL) | 412 g_free(user->phone.work); |
| 415 g_free(user->phone.work); | 413 user->phone.work = g_strdup(number); |
| 416 | |
| 417 user->phone.work = (number == NULL ? NULL : g_strdup(number)); | |
| 418 } | 414 } |
| 419 | 415 |
| 420 void | 416 void |
| 421 msn_user_set_mobile_phone(MsnUser *user, const char *number) | 417 msn_user_set_mobile_phone(MsnUser *user, const char *number) |
| 422 { | 418 { |
| 423 g_return_if_fail(user != NULL); | 419 g_return_if_fail(user != NULL); |
| 424 | 420 |
| 425 if (user->phone.mobile != NULL) | 421 g_free(user->phone.mobile); |
| 426 g_free(user->phone.mobile); | 422 user->phone.mobile = g_strdup(number); |
| 427 | |
| 428 user->phone.mobile = (number == NULL ? NULL : g_strdup(number)); | |
| 429 } | 423 } |
| 430 | 424 |
| 431 void | 425 void |
| 432 msn_user_set_object(MsnUser *user, MsnObject *obj) | 426 msn_user_set_object(MsnUser *user, MsnObject *obj) |
| 433 { | 427 { |