diff options
author | Cosimo Cecchi <cosimoc@gnome.org> | 2012-03-07 21:04:51 -0500 |
---|---|---|
committer | Cosimo Cecchi <cosimoc@gnome.org> | 2012-03-07 21:04:51 -0500 |
commit | 0d46b0620b3b120cde310cb2319c309d8f3e3b82 (patch) | |
tree | cd6e0ceb576e8fff977c8145fffd6e823a79720c /libnautilus-private | |
parent | b9c51fd4eb84a9f52ee4be1bf183fc516984130b (diff) | |
download | nautilus-0d46b0620b3b120cde310cb2319c309d8f3e3b82.tar.gz |
all: remove eel_g_hash_table_new_free_at_exit()
Especially when references can be owned by non-resident modules, this is
just too dangerous.
https://bugzilla.gnome.org/show_bug.cgi?id=670989
Diffstat (limited to 'libnautilus-private')
-rw-r--r-- | libnautilus-private/nautilus-directory-async.c | 8 | ||||
-rw-r--r-- | libnautilus-private/nautilus-directory.c | 15 | ||||
-rw-r--r-- | libnautilus-private/nautilus-file.c | 3 | ||||
-rw-r--r-- | libnautilus-private/nautilus-signaller.c | 1 | ||||
-rw-r--r-- | libnautilus-private/nautilus-thumbnails.c | 2 |
5 files changed, 4 insertions, 25 deletions
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index 98fdaf850..852c6ed3f 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -363,9 +363,7 @@ async_job_start (NautilusDirectory *directory, if (async_job_count >= MAX_ASYNC_JOBS) { if (waiting_directories == NULL) { - waiting_directories = eel_g_hash_table_new_free_at_exit - (NULL, NULL, NULL, - "nautilus-directory-async.c: waiting_directories"); + waiting_directories = g_hash_table_new (NULL, NULL); } g_hash_table_insert (waiting_directories, @@ -379,9 +377,7 @@ async_job_start (NautilusDirectory *directory, { char *uri; if (async_jobs == NULL) { - async_jobs = eel_g_hash_table_new_free_at_exit - (g_str_hash, g_str_equal, NULL, - "nautilus-directory-async.c: async_jobs"); + async_jobs = g_hash_table_new (g_str_hash, g_str_equal); } uri = nautilus_directory_get_uri (directory); key = g_strconcat (uri, ": ", job, NULL); diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index 9038b4901..f69ece7b4 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/nautilus-directory.c @@ -319,16 +319,6 @@ add_preferences_callbacks (void) NULL); } -static void -print_key_directory (gpointer key, gpointer value, gpointer callback_data) -{ - char *uri; - - uri = g_file_get_uri (G_FILE (key)); - g_print ("--> %s\n", uri); - g_free (uri); -} - /** * nautilus_directory_get_by_uri: * @uri: URI of directory to get. @@ -345,10 +335,7 @@ nautilus_directory_get_internal (GFile *location, gboolean create) /* 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, print_key_directory, - "nautilus-directory.c: directories"); - + directories = g_hash_table_new (g_file_hash, (GCompareFunc) g_file_equal); add_preferences_callbacks (); } diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index e2b14a789..95e074ce9 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -549,8 +549,7 @@ modify_link_hash_table (NautilusFile *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, NULL, "nautilus-file.c: symbolic_links"); + symbolic_links = g_hash_table_new (g_str_hash, g_str_equal); } target_uri = nautilus_file_get_symbolic_link_target_uri (file); diff --git a/libnautilus-private/nautilus-signaller.c b/libnautilus-private/nautilus-signaller.c index dbcdb0a2d..a26600dff 100644 --- a/libnautilus-private/nautilus-signaller.c +++ b/libnautilus-private/nautilus-signaller.c @@ -55,7 +55,6 @@ nautilus_signaller_get_current (void) if (global_signaller == NULL) { global_signaller = g_object_new (nautilus_signaller_get_type (), NULL); - eel_debug_call_at_shutdown_with_data (g_object_unref, global_signaller); } return global_signaller; diff --git a/libnautilus-private/nautilus-thumbnails.c b/libnautilus-private/nautilus-thumbnails.c index a09470195..8a80e51d4 100644 --- a/libnautilus-private/nautilus-thumbnails.c +++ b/libnautilus-private/nautilus-thumbnails.c @@ -473,8 +473,6 @@ get_types_table (void) image_mime_types = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - eel_debug_call_at_shutdown_with_data ((GFreeFunc)g_hash_table_destroy, - image_mime_types); format_list = gdk_pixbuf_get_formats (); for (l = format_list; l; l = l->next) { |