summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/fr-command.c8
-rw-r--r--src/glib-utils.c10
-rw-r--r--src/glib-utils.h3
3 files changed, 4 insertions, 17 deletions
diff --git a/src/fr-command.c b/src/fr-command.c
index dc372b0..163f277 100644
--- a/src/fr-command.c
+++ b/src/fr-command.c
@@ -506,7 +506,7 @@ fr_command_class_init (FrCommandClass *class)
static void
fr_command_init (FrCommand *comm)
{
- comm->files = g_ptr_array_sized_new (INITIAL_SIZE);
+ comm->files = g_ptr_array_new_full (INITIAL_SIZE, (GDestroyNotify) file_data_free);
comm->password = NULL;
comm->encrypt_header = FALSE;
@@ -545,7 +545,7 @@ fr_command_finalize (GObject *object)
g_free (comm->e_filename);
g_free (comm->password);
if (comm->files != NULL)
- g_ptr_array_free_full (comm->files, (GFunc) file_data_free, NULL);
+ g_ptr_array_free (comm->files, TRUE);
fr_command_set_process (comm, NULL);
/* Chain up */
@@ -624,8 +624,8 @@ fr_command_list (FrCommand *comm)
fr_command_progress (comm, -1.0);
if (comm->files != NULL) {
- g_ptr_array_free_full (comm->files, (GFunc) file_data_free, NULL);
- comm->files = g_ptr_array_sized_new (INITIAL_SIZE);
+ g_ptr_array_free (comm->files, TRUE);
+ comm->files = g_ptr_array_new_full (INITIAL_SIZE, (GDestroyNotify) file_data_free);
}
comm->action = FR_ACTION_LISTING_CONTENT;
diff --git a/src/glib-utils.c b/src/glib-utils.c
index ed42dd7..f17ddb2 100644
--- a/src/glib-utils.c
+++ b/src/glib-utils.c
@@ -476,16 +476,6 @@ debug (const char *file,
}
-void
-g_ptr_array_free_full (GPtrArray *array,
- GFunc free_func,
- gpointer user_data)
-{
- g_ptr_array_foreach (array, free_func, user_data);
- g_ptr_array_free (array, TRUE);
-}
-
-
GHashTable *static_strings = NULL;
diff --git a/src/glib-utils.h b/src/glib-utils.h
index f9820c4..c43349a 100644
--- a/src/glib-utils.h
+++ b/src/glib-utils.h
@@ -59,9 +59,6 @@ char ** split_line (const char *line,
int n_fields);
const char * get_last_field (const char *line,
int last_field);
-void g_ptr_array_free_full (GPtrArray *array,
- GFunc func,
- gpointer user_data);
const char * get_static_string (const char *s);
char* g_uri_display_basename (const char *uri);