summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2016-10-08 16:00:16 -0400
committerraveit65 <[email protected]>2016-10-10 10:35:41 +0200
commit6e142d59d7408e53ab1e579dba62517b6f59e307 (patch)
tree890d2045335b2b1d9f383afd917d108cc472d0a1
parentbe0f17ff55061ab43636449f4d15a89e418d1f3c (diff)
downloadcaja-6e142d59d7408e53ab1e579dba62517b6f59e307.tar.bz2
caja-6e142d59d7408e53ab1e579dba62517b6f59e307.tar.xz
Fix hashtable warnings on close
As in Nautilus, use g_hash_table_new rather than eel_g_hash_table_new_free_at_exit
-rw-r--r--eel/eel-string.c3
-rw-r--r--libcaja-private/caja-directory.c7
-rw-r--r--libcaja-private/caja-file.c3
3 files changed, 4 insertions, 9 deletions
diff --git a/eel/eel-string.c b/eel/eel-string.c
index 61343eec..8ccbb03a 100644
--- a/eel/eel-string.c
+++ b/eel/eel-string.c
@@ -792,8 +792,7 @@ eel_ref_str_get_unique (const char *string)
if (unique_ref_strs == NULL)
{
unique_ref_strs =
- eel_g_hash_table_new_free_at_exit (g_str_hash, g_str_equal,
- "unique eel_ref_str");
+ g_hash_table_new(g_str_hash, g_str_equal);
}
res = g_hash_table_lookup (unique_ref_strs, string);
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index fcadc2c8..e9292e3b 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -357,11 +357,8 @@ caja_directory_get_internal (GFile *location, gboolean create)
CajaDirectory *directory;
/* Create the hash table first time through. */
- if (directories == NULL)
- {
- directories = eel_g_hash_table_new_free_at_exit
- (g_file_hash, (GCompareFunc)g_file_equal, "caja-directory.c: directories");
-
+ if (directories == NULL) {
+ directories = g_hash_table_new (g_file_hash, (GCompareFunc) g_file_equal);
add_preferences_callbacks ();
}
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index 93a4d17c..6af8a886 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -552,8 +552,7 @@ modify_link_hash_table (CajaFile *file,
/* Create the hash table first time through. */
if (symbolic_links == NULL) {
- symbolic_links = eel_g_hash_table_new_free_at_exit
- (g_str_hash, g_str_equal, "caja-file.c: symbolic_links");
+ symbolic_links = g_hash_table_new (g_str_hash, g_str_equal);
}
target_uri = caja_file_get_symbolic_link_target_uri (file);