[file-roller] g_list_items_async: fixed uri decoding
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller] g_list_items_async: fixed uri decoding
- Date: Mon, 2 Aug 2010 14:53:33 +0000 (UTC)
commit 23c4cf9e9e8103d2dc017a03545422119a346d31
Author: Paolo Bacchilega <paobac src gnome org>
Date: Mon Aug 2 15:52:55 2010 +0200
g_list_items_async: fixed uri decoding
src/gio-utils.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/gio-utils.c b/src/gio-utils.c
index 7886b2e..1123865 100644
--- a/src/gio-utils.c
+++ b/src/gio-utils.c
@@ -766,10 +766,11 @@ get_items_for_current_dir_done (GList *files,
static void
get_items_for_current_dir (GetFileListData *gfl)
{
- const char *directory_name;
- GFile *directory_file;
- char *directory_uri;
- char *base_dir_uri;
+ GFile *current_dir;
+ char *directory_name;
+ GFile *directory_file;
+ char *directory_uri;
+ char *base_dir_uri;
if (gfl->current_dir == NULL) {
if (gfl->done_func) {
@@ -782,7 +783,8 @@ get_items_for_current_dir (GetFileListData *gfl)
return;
}
- directory_name = file_name_from_path ((char*) gfl->current_dir->data);
+ current_dir = g_file_new_for_uri ((char*) gfl->current_dir->data);
+ directory_name = g_file_get_basename (current_dir);
directory_file = g_file_get_child (gfl->base_dir, directory_name);
directory_uri = g_file_get_uri (directory_file);
base_dir_uri = g_file_get_uri (gfl->base_dir);
@@ -794,9 +796,11 @@ get_items_for_current_dir (GetFileListData *gfl)
get_items_for_current_dir_done,
gfl);
- g_free (directory_uri);
g_free (base_dir_uri);
+ g_free (directory_uri);
g_object_unref (directory_file);
+ g_free (directory_name);
+ g_object_unref (current_dir);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]