diff options
author | dx <dx@dxzone.com.ar> | 2017-06-12 17:48:37 -0300 |
---|---|---|
committer | dx <dx@dxzone.com.ar> | 2017-06-12 17:48:37 -0300 |
commit | 02a749023065e7f4c21428589d9c98e29432b793 (patch) | |
tree | 44ec1e9d23f5f5c7142265246ead934d05f4fefc /finch/gntaccount.c | |
parent | bb89355d4bd3ce351e2e2768d44a21196b5abb83 (diff) | |
parent | ef483e26e2f62a3eace8bd0e981ff62ca6a13fda (diff) | |
download | pidgin-02a749023065e7f4c21428589d9c98e29432b793.tar.gz |
Merge release-2.x.y into default
Diffstat (limited to 'finch/gntaccount.c')
-rw-r--r-- | finch/gntaccount.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/finch/gntaccount.c b/finch/gntaccount.c index 0c99d251fc..f8f2dea153 100644 --- a/finch/gntaccount.c +++ b/finch/gntaccount.c @@ -162,7 +162,7 @@ save_account_cb(AccountEditDialog *dialog) } else { const char *old = purple_account_get_protocol_id(account); char *oldproto; - if (strcmp(old, purple_protocol_get_id(protocol))) { + if (!purple_strequal(old, purple_protocol_get_id(protocol))) { purple_notify_error(NULL, _("Error"), _("Account was not modified"), _("The account's protocol cannot be " @@ -450,7 +450,7 @@ add_account_options(AccountEditDialog *dialog) PurpleKeyValuePair *kvp = opt_iter->data; gnt_combo_box_add_data(GNT_COMBO_BOX(combo), kvp->value, kvp->key); - if (g_str_equal(kvp->value, active)) + if (purple_strequal(kvp->value, active)) gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), kvp->value); } } |