changeset
Fix indentation into tabs, and make truthiness of gint explicit.
Thu, 22 Nov 2018 11:25:59 +0200
- author
- Shlomi Fish <shlomif@shlomifish.org>
- date
- Thu, 22 Nov 2018 11:25:59 +0200
- branch
- facebook-group-chat--sort-list
- changeset 39337
- 8b53f4ffdc1b
- parent 39336
- f6f4427c055c
- child 39338
- 7d4e3cd0bbf9
- child 39343
- cf9ab5ae77e1
Fix indentation into tabs, and make truthiness of gint explicit.
See the comments at https://bitbucket.org/pidgin/main/pull-requests/428/sort-the-facebook-contacts-by-name-alias/diff .
| libpurple/protocols/facebook/util.c | file | annotate | diff | comparison | revisions |
--- a/libpurple/protocols/facebook/util.c Wed Nov 21 20:16:29 2018 +0200 +++ b/libpurple/protocols/facebook/util.c Thu Nov 22 11:25:59 2018 +0200 @@ -345,23 +345,23 @@ static gint fb_buddy_cmp(gconstpointer a, gconstpointer b) { - gint alias_verdict, name_verdict; - gchar *astr, *bstr; + gint alias_verdict, name_verdict; + gchar *astr, *bstr; - astr = g_utf8_casefold(purple_buddy_get_alias(a), -1); - bstr = g_utf8_casefold(purple_buddy_get_alias(b), -1); - alias_verdict = g_utf8_collate(astr, bstr); - g_free(astr); - g_free(bstr); - if (alias_verdict) { - return alias_verdict; - } - astr = g_utf8_casefold(purple_buddy_get_name(a), -1); - bstr = g_utf8_casefold(purple_buddy_get_name(b), -1); - name_verdict = g_utf8_collate(astr, bstr); - g_free(astr); - g_free(bstr); - return name_verdict; + astr = g_utf8_casefold(purple_buddy_get_alias(a), -1); + bstr = g_utf8_casefold(purple_buddy_get_alias(b), -1); + alias_verdict = g_utf8_collate(astr, bstr); + g_free(astr); + g_free(bstr); + if (alias_verdict != 0) { + return alias_verdict; + } + astr = g_utf8_casefold(purple_buddy_get_name(a), -1); + bstr = g_utf8_casefold(purple_buddy_get_name(b), -1); + name_verdict = g_utf8_collate(astr, bstr); + g_free(astr); + g_free(bstr); + return name_verdict; } gpointer
