summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-file-operations.c
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-10-18 10:30:31 +0200
committerJasmine Hassan <[email protected]>2012-11-16 09:49:19 +0200
commit7a42b9b076d6b831c89bd0b9e996368c1c95aef3 (patch)
treee878419f312aa059effcd796b11b7f84125e7ad2 /libcaja-private/caja-file-operations.c
parentdecb73c787a2709f977305a4a6da052227d7b37d (diff)
downloadcaja-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-file-operations.c')
-rw-r--r--libcaja-private/caja-file-operations.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index 24bb4a19..067f52d5 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -1858,7 +1858,8 @@ delete_job_done (gpointer user_data)
job = user_data;
- eel_g_object_list_free (job->files);
+ g_list_foreach(job->files, (GFunc) g_object_unref, NULL);
+ g_list_free(job->files);
if (job->done_callback) {
debuting_uris = g_hash_table_new_full (g_file_hash, (GEqualFunc)g_file_equal, g_object_unref, NULL);
@@ -2187,7 +2188,8 @@ has_trash_files (GMount *mount)
}
}
- eel_g_object_list_free (dirs);
+ g_list_foreach(dirs, (GFunc) g_object_unref, NULL);
+ g_list_free(dirs);
return res;
}
@@ -4460,7 +4462,8 @@ copy_job_done (gpointer user_data)
job->done_callback (job->debuting_files, job->done_callback_data);
}
- eel_g_object_list_free (job->files);
+ g_list_foreach(job->files, (GFunc) g_object_unref, NULL);
+ g_list_free(job->files);
if (job->destination) {
g_object_unref (job->destination);
}
@@ -4987,7 +4990,8 @@ move_job_done (gpointer user_data)
job->done_callback (job->debuting_files, job->done_callback_data);
}
- eel_g_object_list_free (job->files);
+ g_list_foreach(job->files, (GFunc) g_object_unref, NULL);
+ g_list_free(job->files);
g_object_unref (job->destination);
g_hash_table_unref (job->debuting_files);
g_free (job->icon_positions);
@@ -5067,7 +5071,8 @@ move_job (GIOSchedulerJob *io_job,
&source_info, &transfer_info);
aborted:
- eel_g_list_free_deep (fallbacks);
+ g_list_foreach(fallbacks, (GFunc) g_free, NULL);
+ g_list_free(fallbacks);
g_free (dest_fs_id);
g_free (dest_fs_type);
@@ -5321,7 +5326,8 @@ link_job_done (gpointer user_data)
job->done_callback (job->debuting_files, job->done_callback_data);
}
- eel_g_object_list_free (job->files);
+ g_list_foreach(job->files, (GFunc) g_object_unref, NULL);
+ g_list_free(job->files);
g_object_unref (job->destination);
g_hash_table_unref (job->debuting_files);
g_free (job->icon_positions);
@@ -5773,7 +5779,8 @@ caja_file_operations_copy_move (const GList *item_uris,
done_callback, done_callback_data);
}
- eel_g_object_list_free (locations);
+ g_list_foreach(locations, (GFunc) g_object_unref, NULL);
+ g_list_free(locations);
if (dest) {
g_object_unref (dest);
}
@@ -6251,7 +6258,8 @@ empty_trash_job_done (gpointer user_data)
job = user_data;
- eel_g_object_list_free (job->trash_dirs);
+ g_list_foreach(job->trash_dirs, (GFunc) g_object_unref, NULL);
+ g_list_free(job->trash_dirs);
if (job->done_callback) {
job->done_callback (job->done_callback_data);