summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-mime-actions.c
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-23 11:18:34 +0200
committerJasmine Hassan <[email protected]>2012-11-23 11:18:34 +0200
commitb00cccb74307a49df74deb785936e3cd9cf3a5ad (patch)
treef2bcc459a2bef12678e642d0a14ce7f02373b71d /libcaja-private/caja-mime-actions.c
parentb12a7f6ea3309ecddfc7e3ae839a7b558c862533 (diff)
downloadcaja-b00cccb74307a49df74deb785936e3cd9cf3a5ad.tar.bz2
caja-b00cccb74307a49df74deb785936e3cd9cf3a5ad.tar.xz
[all] include src/glibcompat.h & use g_list_free_full() where needed
Also fixes a double-free regression in lc-p/caja-query from 7a42b9b0
Diffstat (limited to 'libcaja-private/caja-mime-actions.c')
-rw-r--r--libcaja-private/caja-mime-actions.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/libcaja-private/caja-mime-actions.c b/libcaja-private/caja-mime-actions.c
index 4668e0ac..bbcc6f4d 100644
--- a/libcaja-private/caja-mime-actions.c
+++ b/libcaja-private/caja-mime-actions.c
@@ -44,6 +44,8 @@
#include "caja-debug-log.h"
#include "caja-open-with-dialog.h"
+#include <src/glibcompat.h> /* for g_list_free_full */
+
typedef enum
{
ACTIVATION_ACTION_LAUNCH_DESKTOP_FILE,
@@ -230,8 +232,7 @@ static void
application_launch_parameters_free (ApplicationLaunchParameters *parameters)
{
g_object_unref (parameters->application);
- g_list_foreach(parameters->uris, (GFunc) g_free, NULL);
- g_list_free(parameters->uris);
+ g_list_free_full (parameters->uris, g_free);
g_free (parameters);
}
@@ -513,8 +514,7 @@ caja_mime_has_any_applications_for_file (CajaFile *file)
if (apps)
{
result = TRUE;
- g_list_foreach(apps, (GFunc) g_object_unref, NULL);
- g_list_free(apps);
+ g_list_free_full (apps, g_object_unref);
}
else
{
@@ -735,8 +735,7 @@ trash_or_delete_files (GtkWindow *parent_window,
caja_file_operations_trash_or_delete (locations,
parent_window,
NULL, NULL);
- g_list_foreach(locations, (GFunc) g_object_unref, NULL);
- g_list_free(locations);
+ g_list_free_full (locations, g_object_unref);
}
static void