summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-directory.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-11-16 05:08:48 -0800
committerStefano Karapetsas <[email protected]>2012-11-16 05:08:48 -0800
commitdc66bc40724191f0068869773576dc4edf042c6f (patch)
tree74b9684feea188736b21f2c829f29befaaf2e9da /libcaja-private/caja-directory.c
parent935e1fed604f48e68d125d205c890a59f46f8f21 (diff)
parent1466df20591105550738a1d0784a623af9909abf (diff)
downloadcaja-dc66bc40724191f0068869773576dc4edf042c6f.tar.bz2
caja-dc66bc40724191f0068869773576dc4edf042c6f.tar.xz
Merge pull request #42 from jasmineaura/develop
Bring Caja up to speed, stage1
Diffstat (limited to 'libcaja-private/caja-directory.c')
-rw-r--r--libcaja-private/caja-directory.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/libcaja-private/caja-directory.c b/libcaja-private/caja-directory.c
index 6479b38a..38d73794 100644
--- a/libcaja-private/caja-directory.c
+++ b/libcaja-private/caja-directory.c
@@ -32,14 +32,13 @@
#include "caja-search-directory.h"
#include "caja-global-preferences.h"
#include "caja-lib-self-check-functions.h"
-#include "caja-marshal.h"
#include "caja-metadata.h"
#include "caja-desktop-directory.h"
#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
{
@@ -176,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)
@@ -213,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));
}
@@ -759,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)
@@ -1093,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
@@ -1142,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
@@ -1203,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