Use g_hash_table_add() when using a hash table as a set.

g_hash_table_add(table, key) uses less memory than
g_hash_table_insert(table, key, GINT_TO_POINTER (1)).

Also use g_hash_table_contains() when testing for membership.

1 files changed, 11 insertions, 7 deletions

diff --git a/e-util/e-table-field-chooser-item.c b/e-util/e-table-field-chooser-item.c
index f72e059f20..c7335f8a5c 100644
--- a/e-util/e-table-field-chooser-item.c
+++ b/e-util/e-table-field-chooser-item.c
@@ -128,19 +128,23 @@ etfci_rebuild_combined (ETableFieldChooserItem *etfci)
 		ETableCol *ecol = e_table_header_get_column (etfci->header, i);
 		if (ecol->disabled)
 			continue;
-		g_hash_table_insert (
-			hash, GINT_TO_POINTER (ecol->col_idx),
-			GINT_TO_POINTER (1));
+		g_hash_table_add (hash, GINT_TO_POINTER (ecol->col_idx));
 	}
 
 	count = e_table_header_count (etfci->full_header);
 	for (i = 0; i < count; i++) {
-		ETableCol *ecol = e_table_header_get_column (etfci->full_header, i);
+		ETableCol *ecol;
+		gpointer key;
+
+		ecol = e_table_header_get_column (etfci->full_header, i);
+		key = GINT_TO_POINTER (ecol->col_idx);
+
 		if (ecol->disabled)
 			continue;
-		if (!(GPOINTER_TO_INT (g_hash_table_lookup (
-				hash, GINT_TO_POINTER (ecol->col_idx)))))
-			e_table_header_add_column (etfci->combined_header, ecol, -1);
+
+		if (!g_hash_table_contains (hash, key))
+			e_table_header_add_column (
+				etfci->combined_header, ecol, -1);
 	}
 
 	g_hash_table_destroy (hash);