summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-02-08 10:48:43 +0300
committermonsta <[email protected]>2016-02-08 10:57:20 +0300
commit883201a49341d588f5a6ffe2b7fd54676eb71019 (patch)
treee890e8b3003425f369e44d18c44f6ea9f14ceb23 /libcaja-private
parent35a84bbc4f81914136c894dd55630f21acbeb54a (diff)
downloadcaja-883201a49341d588f5a6ffe2b7fd54676eb71019.tar.bz2
caja-883201a49341d588f5a6ffe2b7fd54676eb71019.tar.xz
use g_hash_table_remove_all and get rid of some callbacks
taken from https://git.gnome.org/browse/nautilus/commit/?id=564264cc6cc6fa44390791248019547a7133d70d and applied in some other places as well
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-desktop-directory.c4
-rw-r--r--libcaja-private/caja-directory-async.c8
2 files changed, 3 insertions, 9 deletions
diff --git a/libcaja-private/caja-desktop-directory.c b/libcaja-private/caja-desktop-directory.c
index bb03f06a..de998cd2 100644
--- a/libcaja-private/caja-desktop-directory.c
+++ b/libcaja-private/caja-desktop-directory.c
@@ -480,8 +480,8 @@ update_desktop_directory (CajaDesktopDirectory *desktop)
real_directory = desktop->details->real_directory;
if (real_directory != NULL)
{
- g_hash_table_foreach_remove (desktop->details->callbacks, (GHRFunc) gtk_true, NULL);
- g_hash_table_foreach_remove (desktop->details->monitors, (GHRFunc) gtk_true, NULL);
+ g_hash_table_remove_all (desktop->details->callbacks);
+ g_hash_table_remove_all (desktop->details->monitors);
g_signal_handlers_disconnect_by_func (real_directory, done_loading_callback, desktop);
g_signal_handlers_disconnect_by_func (real_directory, forward_files_added_cover, desktop);
diff --git a/libcaja-private/caja-directory-async.c b/libcaja-private/caja-directory-async.c
index a795c161..5bab5858 100644
--- a/libcaja-private/caja-directory-async.c
+++ b/libcaja-private/caja-directory-async.c
@@ -1162,12 +1162,6 @@ directory_load_cancel (CajaDirectory *directory)
}
}
-static gboolean
-remove_callback (gpointer key, gpointer value, gpointer user_data)
-{
- return TRUE;
-}
-
static void
file_list_cancel (CajaDirectory *directory)
{
@@ -1187,7 +1181,7 @@ file_list_cancel (CajaDirectory *directory)
if (directory->details->hidden_file_hash)
{
- g_hash_table_foreach_remove (directory->details->hidden_file_hash, remove_callback, NULL);
+ g_hash_table_remove_all (directory->details->hidden_file_hash);
}
}