HGKeeper

fe7760eddd4a

Fix for the "Search for Friends" screen saying 0 results while the server is still processing

+12 -3

~~--- a/hangouts_connection.c Mon Nov 28 14:27:43 2016 +1300~~

+++ b/hangouts_connection.c Thu Dec 22 08:54:52 2016 +1300

@@ -773,6 +773,7 @@

JsonObject *node;

gint index, length;

gchar *search_term;

+ JsonObject *status;

PurpleNotifySearchResults *results;

PurpleNotifySearchColumn *column;

@@ -791,9 +792,17 @@

length = json_array_get_length(resultsarray);

if (length == 0) {

~~- gchar *primary_text = g_strdup_printf(_("Your search for the user \"%s\" returned no results"), search_term);~~

~~- purple_notify_warning(ha->pc, _("No users found"), primary_text, "", purple_request_cpar_from_connection(ha->pc));~~

~~- g_free(primary_text);~~

+ status = json_object_get_object_member(node, "status");

+

+ if (!json_object_has_member(status, "personalResultsNotReady") || json_object_get_boolean_member(status, "personalResultsNotReady") == TRUE) {

+ //Not ready yet, retry

+ hangouts_search_users_text(ha, search_term);

+

+ } else {

+ gchar *primary_text = g_strdup_printf(_("Your search for the user \"%s\" returned no results"), search_term);

+ purple_notify_warning(ha->pc, _("No users found"), primary_text, "", purple_request_cpar_from_connection(ha->pc));

+ g_free(primary_text);

+ }

g_dataset_destroy(connection);

json_object_unref(node);