comparison: pidgin/gtklog.c
pidgin/gtklog.c
- changeset 38358
- 30ba44276e74
- parent 38007
- 3b971d2ecae1
- parent 38259
- c593fc9f5438
- child 38620
- b02941b9fa9a
- child 38888
- 8bcae3a0b165
equal
deleted
inserted
replaced
| 38346:dee30d35e5e7 | 38358:30ba44276e74 |
|---|---|
| 77 return FALSE; | 77 return FALSE; |
| 78 } | 78 } |
| 79 | 79 |
| 80 normal = g_strdup(purple_normalize(a->account, a->buddyname)); | 80 normal = g_strdup(purple_normalize(a->account, a->buddyname)); |
| 81 ret = (a->account == b->account) && | 81 ret = (a->account == b->account) && |
| 82 !strcmp(normal, purple_normalize(b->account, b->buddyname)); | 82 purple_strequal(normal, purple_normalize(b->account, b->buddyname)); |
| 83 g_free(normal); | 83 g_free(normal); |
| 84 | 84 |
| 85 return ret; | 85 return ret; |
| 86 } | 86 } |
| 87 | 87 |
| 130 webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(lv->web_view)); | 130 webkit_web_view_unmark_text_matches(WEBKIT_WEB_VIEW(lv->web_view)); |
| 131 select_first_log(lv); | 131 select_first_log(lv); |
| 132 return; | 132 return; |
| 133 } | 133 } |
| 134 | 134 |
| 135 if (lv->search != NULL && !strcmp(lv->search, search_term)) | 135 if (lv->search != NULL && purple_strequal(lv->search, search_term)) |
| 136 { | 136 { |
| 137 /* Searching for the same term acts as "Find Next" */ | 137 /* Searching for the same term acts as "Find Next" */ |
| 138 webkit_web_view_search_text(WEBKIT_WEB_VIEW(lv->web_view), lv->search, FALSE, TRUE, TRUE); | 138 webkit_web_view_search_text(WEBKIT_WEB_VIEW(lv->web_view), lv->search, FALSE, TRUE, TRUE); |
| 139 return; | 139 return; |
| 140 } | 140 } |
| 501 PurpleLog *log = logs->data; | 501 PurpleLog *log = logs->data; |
| 502 | 502 |
| 503 month = purple_utf8_strftime(_("%B %Y"), | 503 month = purple_utf8_strftime(_("%B %Y"), |
| 504 log->tm ? log->tm : localtime(&log->time)); | 504 log->tm ? log->tm : localtime(&log->time)); |
| 505 | 505 |
| 506 if (strcmp(month, prev_top_month) != 0) | 506 if (!purple_strequal(month, prev_top_month)) |
| 507 { | 507 { |
| 508 /* top level */ | 508 /* top level */ |
| 509 gtk_tree_store_append(lv->treestore, &toplevel, NULL); | 509 gtk_tree_store_append(lv->treestore, &toplevel, NULL); |
| 510 gtk_tree_store_set(lv->treestore, &toplevel, 0, month, 1, NULL, -1); | 510 gtk_tree_store_set(lv->treestore, &toplevel, 0, month, 1, NULL, -1); |
| 511 | 511 |
