diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-18 10:30:31 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:49:19 +0200 |
| commit | 7a42b9b076d6b831c89bd0b9e996368c1c95aef3 (patch) | |
| tree | e878419f312aa059effcd796b11b7f84125e7ad2 /libcaja-private/caja-directory.c | |
| parent | decb73c787a2709f977305a4a6da052227d7b37d (diff) | |
| download | caja-7a42b9b076d6b831c89bd0b9e996368c1c95aef3.tar.bz2 caja-7a42b9b076d6b831c89bd0b9e996368c1c95aef3.tar.xz | |
[all] use g_list_free() and g_strcmp0 instead of eel functions
Was: general: use g_list_free_full() instead of eel functions
http://git.gnome.org/browse/nautilus/commit/?id=5e669515fd7f760382e6b7aa1449734a35a2d7f4
.
Instead of g_list_free_full(), we use g_list_foreach and g_list_free() to avoid
unnecessary glib dependency bump to 2.28
Diffstat (limited to 'libcaja-private/caja-directory.c')
| -rw-r--r-- | libcaja-private/caja-directory.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c index efcfc5ed..38d73794 100644 --- a/libcaja-private/caja-directory.c +++ b/libcaja-private/caja-directory.c @@ -37,8 +37,8 @@ #include "caja-vfs-directory.h" #include <eel/eel-glib-extensions.h> #include <eel/eel-gtk-macros.h> -#include <eel/eel-string.h> #include <gtk/gtk.h> +#include <string.h> enum { @@ -175,7 +175,8 @@ caja_directory_finalize (GObject *object) if (directory->details->monitor_list != NULL) { g_warning ("destroying a CajaDirectory while it's being monitored"); - eel_g_list_free_deep (directory->details->monitor_list); + g_list_foreach(directory->details->monitor_list, (GFunc) g_free, NULL); + g_list_free(directory->details->monitor_list); } if (directory->details->monitor != NULL) @@ -212,7 +213,8 @@ caja_directory_finalize (GObject *object) g_assert (directory->details->directory_load_in_progress == NULL); g_assert (directory->details->count_in_progress == NULL); g_assert (directory->details->dequeue_pending_idle_id == 0); - eel_g_object_list_free (directory->details->pending_file_info); + g_list_foreach(directory->details->pending_file_info, (GFunc) g_object_unref, NULL); + g_list_free(directory->details->pending_file_info); EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object)); } @@ -758,7 +760,7 @@ caja_directory_find_file_by_internal_filename (CajaDirectory *directory, { CajaFile *result; - if (eel_strcmp (internal_filename, ".") == 0) + if (g_strcmp0 (internal_filename, ".") == 0) { result = caja_directory_get_existing_corresponding_file (directory); if (result != NULL) @@ -1092,7 +1094,8 @@ caja_directory_notify_files_added_by_uri (GList *uris) files = caja_file_list_from_uris (uris); caja_directory_notify_files_added (files); - eel_g_object_list_free (files); + g_list_foreach(files, (GFunc) g_object_unref, NULL); + g_list_free(files); } void @@ -1141,7 +1144,8 @@ caja_directory_notify_files_changed_by_uri (GList *uris) files = caja_file_list_from_uris (uris); caja_directory_notify_files_changed (files); - eel_g_object_list_free (files); + g_list_foreach(files, (GFunc) g_object_unref, NULL); + g_list_free(files); } void @@ -1202,7 +1206,8 @@ caja_directory_notify_files_removed_by_uri (GList *uris) files = caja_file_list_from_uris (uris); caja_directory_notify_files_changed (files); - eel_g_object_list_free (files); + g_list_foreach(files, (GFunc) g_object_unref, NULL); + g_list_free(files); } static void |