cpw.nader.asynclogging-3: d4290ea5: Fixed up a case where the completion lis...

[morshed.nader at gmail.com]

----------------------------------------------------------------------
Revision: d4290ea54506b3b5ad2332520d0162f25e1986be
Parent:   d242f17f21b383df08d48ae3c1c77ebd24cb51e1
Author:   morshed.nader at gmail.com
Date:     01/18/11 13:07:01
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/d4290ea54506b3b5ad2332520d0162f25e1986be

Changelog: 

Fixed up a case where the completion list could act on its list when it shouldn't

Changes against parent d242f17f21b383df08d48ae3c1c77ebd24cb51e1

  patched  pidgin/gtkutils.c

-------------- next part --------------
============================================================
--- pidgin/gtkutils.c	7e8dc75a29cbeef8fa53003567496d5f53d9fd90
+++ pidgin/gtkutils.c	ff602bdc85f89effd93943f96bddfb0967960141
@@ -2060,16 +2060,17 @@ add_completion_list_cb(GObject *object, 
 add_completion_list_cb(GObject *object, GAsyncResult *res, gpointer userdata)
 {
 	GHashTable *sets;
-	GError *err = NULL;
+	GError *error = NULL;
 
-	sets = purple_log_get_log_sets_finish(PURPLE_LOG(object), res, &err);
+	sets = purple_log_get_log_sets_finish(PURPLE_LOG(object), res, &error);
 
-	if (sets == NULL && err->code != G_IO_ERROR_CANCELLED)
-		purple_debug_error("gtkutils", "Unable to get hash table: %s\n", err->message);
-	else
+	if (sets == NULL) {
+		if (error->code != G_IO_ERROR_CANCELLED)
+			purple_debug_error("gtkutils", "Unable to get hash table: %s\n", error->message);
+	} else
 		g_hash_table_foreach(sets, (GHFunc) get_log_set_name, userdata);
 
-	g_clear_error(&err);
+	g_clear_error(&error);
 }
 
 static void