diff options
| author | jgeboski <jgeboski@gmail.com> | 2015-12-28 17:04:16 -0500 |
|---|---|---|
| committer | jgeboski <jgeboski@gmail.com> | 2015-12-28 17:04:16 -0500 |
| commit | 1beae41239b95f5957764467902ef5bd2a05e128 (patch) | |
| tree | 84fd11d8d8ab4d1ff3fcd0e9db9fc177fa3d8b46 /facebook/facebook-api.c | |
| parent | 2df83c12a660762d6793989aa781058dba0c55ac (diff) | |
| download | bitlbee-facebook-1beae41239b95f5957764467902ef5bd2a05e128.tar.gz bitlbee-facebook-1beae41239b95f5957764467902ef5bd2a05e128.tar.bz2 bitlbee-facebook-1beae41239b95f5957764467902ef5bd2a05e128.tar.xz | |
facebook-api: fixed the self contact being ignored
This is a regression introduced by 00c0ae8.
Diffstat (limited to 'facebook/facebook-api.c')
| -rw-r--r-- | facebook/facebook-api.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/facebook/facebook-api.c b/facebook/facebook-api.c index 90f0fe3..3461e2a 100644 --- a/facebook/facebook-api.c +++ b/facebook/facebook-api.c @@ -1881,8 +1881,10 @@ fb_api_cb_contacts(FbHttpRequest *req, gpointer data) { const gchar *str; FbApi *api = data; + FbApiPrivate *priv = api->priv; FbApiUser *user; FbHttpValues *prms; + FbId uid; FbJsonValues *values; gboolean complete; gchar *writeid = NULL; @@ -1899,10 +1901,10 @@ fb_api_cb_contacts(FbHttpRequest *req, gpointer data) fb_json_values_add(values, FB_JSON_TYPE_STR, TRUE, "$.graph_api_write_id"); fb_json_values_add(values, FB_JSON_TYPE_STR, TRUE, - "$.represented_profile.friendship_status"); - fb_json_values_add(values, FB_JSON_TYPE_STR, TRUE, "$.represented_profile.id"); fb_json_values_add(values, FB_JSON_TYPE_STR, TRUE, + "$.represented_profile.friendship_status"); + fb_json_values_add(values, FB_JSON_TYPE_STR, TRUE, "$.structured_name.text"); fb_json_values_add(values, FB_JSON_TYPE_STR, TRUE, "$.hugePictureUrl.uri"); @@ -1912,17 +1914,20 @@ fb_api_cb_contacts(FbHttpRequest *req, gpointer data) while (fb_json_values_update(values, &err)) { g_free(writeid); writeid = fb_json_values_next_str_dup(values, NULL); - str = fb_json_values_next_str(values, NULL); count++; - if (g_strcmp0(str, "ARE_FRIENDS") != 0) { + str = fb_json_values_next_str(values, "0"); + uid = FB_ID_FROM_STR(str); + str = fb_json_values_next_str(values, NULL); + + if ((g_strcmp0(str, "ARE_FRIENDS") != 0) && + (uid != priv->uid)) + { continue; } user = fb_api_user_dup(NULL, FALSE); - str = fb_json_values_next_str(values, "0"); - - user->uid = FB_ID_FROM_STR(str); + user->uid = uid; user->name = fb_json_values_next_str_dup(values, NULL); user->icon = fb_json_values_next_str_dup(values, NULL); |