comparison: pidgin/gtkblist.c
pidgin/gtkblist.c
- branch
- string-comparison-r2
- changeset 38259
- c593fc9f5438
- parent 38258
- 9a6551eba09c
- child 38358
- 30ba44276e74
- child 38698
- 9b2ec7257913
equal
deleted
inserted
replaced
| 38258:9a6551eba09c | 38259:c593fc9f5438 |
|---|---|
| 1113 | 1113 |
| 1114 static void | 1114 static void |
| 1115 chat_select_account_cb(GObject *w, PurpleAccount *account, | 1115 chat_select_account_cb(GObject *w, PurpleAccount *account, |
| 1116 PidginChatData *data) | 1116 PidginChatData *data) |
| 1117 { | 1117 { |
| 1118 if (strcmp(purple_account_get_protocol_id(data->rq_data.account), | 1118 if (purple_strequal(purple_account_get_protocol_id(data->rq_data.account), |
| 1119 purple_account_get_protocol_id(account)) == 0) | 1119 purple_account_get_protocol_id(account))) |
| 1120 { | 1120 { |
| 1121 data->rq_data.account = account; | 1121 data->rq_data.account = account; |
| 1122 } | 1122 } |
| 1123 else | 1123 else |
| 1124 { | 1124 { |
| 3775 /* Alias */ | 3775 /* Alias */ |
| 3776 /* If there's not a contact alias, the node is being displayed with | 3776 /* If there's not a contact alias, the node is being displayed with |
| 3777 * this alias, so there's no point in showing it in the tooltip. */ | 3777 * this alias, so there's no point in showing it in the tooltip. */ |
| 3778 if (full && c && b->alias != NULL && b->alias[0] != '\0' && | 3778 if (full && c && b->alias != NULL && b->alias[0] != '\0' && |
| 3779 (c->alias != NULL && c->alias[0] != '\0') && | 3779 (c->alias != NULL && c->alias[0] != '\0') && |
| 3780 strcmp(c->alias, b->alias) != 0) | 3780 !purple_strequal(c->alias, b->alias)) |
| 3781 { | 3781 { |
| 3782 tmp = g_markup_escape_text(b->alias, -1); | 3782 tmp = g_markup_escape_text(b->alias, -1); |
| 3783 purple_notify_user_info_add_pair(user_info, _("Buddy Alias"), tmp); | 3783 purple_notify_user_info_add_pair(user_info, _("Buddy Alias"), tmp); |
| 3784 g_free(tmp); | 3784 g_free(tmp); |
| 3785 } | 3785 } |
| 5377 return; | 5377 return; |
| 5378 } | 5378 } |
| 5379 | 5379 |
| 5380 /* else, new and old are both non-NULL */ | 5380 /* else, new and old are both non-NULL */ |
| 5381 | 5381 |
| 5382 descriptions_differ = strcmp(old->description, new->description); | 5382 descriptions_differ = !purple_strequal(old->description, new->description); |
| 5383 desc = new->description; | 5383 desc = new->description; |
| 5384 | 5384 |
| 5385 switch (new->type) { | 5385 switch (new->type) { |
| 5386 case PURPLE_CONNECTION_ERROR_NAME_IN_USE: | 5386 case PURPLE_CONNECTION_ERROR_NAME_IN_USE: |
| 5387 if (old->type == PURPLE_CONNECTION_ERROR_NAME_IN_USE | 5387 if (old->type == PURPLE_CONNECTION_ERROR_NAME_IN_USE |
| 7650 GList *l = pidgin_blist_sort_methods; | 7650 GList *l = pidgin_blist_sort_methods; |
| 7651 | 7651 |
| 7652 if(!id) | 7652 if(!id) |
| 7653 id = "none"; | 7653 id = "none"; |
| 7654 | 7654 |
| 7655 while (l && strcmp(((struct pidgin_blist_sort_method*)l->data)->id, id)) | 7655 while (l && !purple_strequal(((struct pidgin_blist_sort_method*)l->data)->id, id)) |
| 7656 l = l->next; | 7656 l = l->next; |
| 7657 | 7657 |
| 7658 if (l) { | 7658 if (l) { |
| 7659 current_sort_method = l->data; | 7659 current_sort_method = l->data; |
| 7660 } else if (!current_sort_method) { | 7660 } else if (!current_sort_method) { |
