summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-10-06 18:12:22 +0200
committerStefano Karapetsas <[email protected]>2013-10-06 18:12:22 +0200
commit3512eb9905039f0dad597d7591a45b7fa763d2d7 (patch)
tree94e3d2410952aac2658850ada916e52d00337675
parent70559a30ba34d71d0d9567457c3ec20de7d25fb7 (diff)
downloadcaja-3512eb9905039f0dad597d7591a45b7fa763d2d7.tar.bz2
caja-3512eb9905039f0dad597d7591a45b7fa763d2d7.tar.xz
Properly free GHashTable in properties window
Closes #178 https://github.com/mate-desktop/mate-file-manager/issues/178 I had to recover two functions previously removed in eel-glib-extensions.
-rw-r--r--eel/eel-glib-extensions.c28
-rw-r--r--eel/eel-glib-extensions.h6
-rw-r--r--src/file-manager/fm-properties-window.c2
3 files changed, 35 insertions, 1 deletions
diff --git a/eel/eel-glib-extensions.c b/eel/eel-glib-extensions.c
index ee108050..96eeb354 100644
--- a/eel/eel-glib-extensions.c
+++ b/eel/eel-glib-extensions.c
@@ -378,6 +378,34 @@ eel_g_str_list_index (GList *str_list,
}
/**
+ * eel_g_list_free_deep_custom
+ *
+ * Frees the elements of a list and then the list, using a custom free function.
+ *
+ * @list: List of elements that can be freed with the provided free function.
+ * @element_free_func: function to call with the data pointer and user_data to free it.
+ * @user_data: User data to pass to element_free_func
+ **/
+void
+eel_g_list_free_deep_custom (GList *list, GFunc element_free_func, gpointer user_data)
+{
+ g_list_foreach (list, element_free_func, user_data);
+ g_list_free (list);
+}
+
+/**
+ * eel_g_list_free_deep
+ *
+ * Frees the elements of a list and then the list.
+ * @list: List of elements that can be freed with g_free.
+ **/
+void
+eel_g_list_free_deep (GList *list)
+{
+ eel_g_list_free_deep_custom (list, (GFunc) g_free, NULL);
+}
+
+/**
* eel_g_strv_find
*
* Get index of string in array of strings.
diff --git a/eel/eel-glib-extensions.h b/eel/eel-glib-extensions.h
index 907a1ec9..9c62c57f 100644
--- a/eel/eel-glib-extensions.h
+++ b/eel/eel-glib-extensions.h
@@ -54,6 +54,12 @@ GList * eel_g_list_partition (GList *
gpointer user_data,
GList **removed);
+/* List functions for lists of g_free'able objects. */
+void eel_g_list_free_deep (GList *list);
+void eel_g_list_free_deep_custom (GList *list,
+ GFunc element_free_func,
+ gpointer user_data);
+
/* List functions for lists of C strings. */
gboolean eel_g_str_list_equal (GList *str_list_a,
GList *str_list_b);
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 854de866..983cfe3b 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -3423,7 +3423,7 @@ get_initial_emblems (GList *files)
ret = g_hash_table_new_full (g_direct_hash,
g_direct_equal,
NULL,
- (GDestroyNotify) g_free);
+ (GDestroyNotify) eel_g_list_free_deep);
for (l = files; l != NULL; l = l->next) {
CajaFile *file;