comparison: libpurple/savedstatuses.c
libpurple/savedstatuses.c
- branch
- next.minor
- changeset 25859
- b42be7bb9dac
- parent 22868
- 7ef8674b5d1d
- child 25911
- f22097dc8413
equal
deleted
inserted
replaced
| 25857:f40a2e40f651 | 25859:b42be7bb9dac |
|---|---|
| 459 int i; | 459 int i; |
| 460 | 460 |
| 461 ret = g_new0(PurpleSavedStatus, 1); | 461 ret = g_new0(PurpleSavedStatus, 1); |
| 462 | 462 |
| 463 attrib = xmlnode_get_attrib(status, "transient"); | 463 attrib = xmlnode_get_attrib(status, "transient"); |
| 464 if ((attrib == NULL) || (strcmp(attrib, "true"))) | 464 if (!purple_strequal(attrib, "true")) |
| 465 { | 465 { |
| 466 /* Read the title */ | 466 /* Read the title */ |
| 467 attrib = xmlnode_get_attrib(status, "name"); | 467 attrib = xmlnode_get_attrib(status, "name"); |
| 468 ret->title = g_strdup(attrib); | 468 ret->title = g_strdup(attrib); |
| 469 } | 469 } |
| 938 g_return_val_if_fail(title != NULL, NULL); | 938 g_return_val_if_fail(title != NULL, NULL); |
| 939 | 939 |
| 940 for (iter = saved_statuses; iter != NULL; iter = iter->next) | 940 for (iter = saved_statuses; iter != NULL; iter = iter->next) |
| 941 { | 941 { |
| 942 status = (PurpleSavedStatus *)iter->data; | 942 status = (PurpleSavedStatus *)iter->data; |
| 943 if ((status->title != NULL) && !strcmp(status->title, title)) | 943 if (purple_strequal(status->title, title)) |
| 944 return status; | 944 return status; |
| 945 } | 945 } |
| 946 | 946 |
| 947 return NULL; | 947 return NULL; |
| 948 } | 948 } |
| 973 for (iter = saved_statuses; iter != NULL; iter = iter->next) | 973 for (iter = saved_statuses; iter != NULL; iter = iter->next) |
| 974 { | 974 { |
| 975 status = (PurpleSavedStatus *)iter->data; | 975 status = (PurpleSavedStatus *)iter->data; |
| 976 if ((status->type == type) && purple_savedstatus_is_transient(status) && | 976 if ((status->type == type) && purple_savedstatus_is_transient(status) && |
| 977 !purple_savedstatus_has_substatuses(status) && | 977 !purple_savedstatus_has_substatuses(status) && |
| 978 (((status->message == NULL) && (message == NULL)) || | 978 purple_strequal(status->message, message)) |
| 979 ((status->message != NULL) && (message != NULL) && !strcmp(status->message, message)))) | |
| 980 { | 979 { |
| 981 return status; | 980 return status; |
| 982 } | 981 } |
| 983 } | 982 } |
| 984 | 983 |
