[libgsf] Use gsf_zip_vdir_new instead of gsf_vdir_new
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgsf] Use gsf_zip_vdir_new instead of gsf_vdir_new
- Date: Fri, 20 Jul 2012 19:43:48 +0000 (UTC)
commit 9f8113800719cb754345a6e29a2b22bbdfbd882f
Author: Jean Brefort <jean brefort normalesup org>
Date: Fri Jul 20 21:42:24 2012 +0200
Use gsf_zip_vdir_new instead of gsf_vdir_new
gsf/gsf-infile-zip.c | 6 +++---
gsf/gsf-outfile-zip.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gsf/gsf-infile-zip.c b/gsf/gsf-infile-zip.c
index 403d35a..936ca0b 100644
--- a/gsf/gsf-infile-zip.c
+++ b/gsf/gsf-infile-zip.c
@@ -110,7 +110,7 @@ vdir_insert (GsfZipVDir *vdir, char const * name, GsfZipDirent *dirent)
dirname = g_strndup (name, (gsize) (p - name));
child = vdir_child_by_name (vdir, dirname);
if (!child) {
- child = gsf_vdir_new (dirname, TRUE, NULL);
+ child = gsf_zip_vdir_new (dirname, TRUE, NULL);
gsf_vdir_add_child (vdir, child);
}
g_free (dirname);
@@ -119,7 +119,7 @@ vdir_insert (GsfZipVDir *vdir, char const * name, GsfZipDirent *dirent)
vdir_insert (child, name, dirent);
}
} else { /* A simple file name */
- child = gsf_vdir_new (name, FALSE, dirent);
+ child = gsf_zip_vdir_new (name, FALSE, dirent);
gsf_vdir_add_child (vdir, child);
}
}
@@ -353,7 +353,7 @@ zip_build_vdirs (GsfInfileZip *zip)
GsfZipDirent *dirent;
ZipInfo *info = zip->info;
- info->vdir = gsf_vdir_new ("", TRUE, NULL);
+ info->vdir = gsf_zip_vdir_new ("", TRUE, NULL);
for (l = info->dirent_list; l; l = l->next) {
dirent = (GsfZipDirent *) l->data;
vdir_insert (info->vdir, dirent->name, dirent);
diff --git a/gsf/gsf-outfile-zip.c b/gsf/gsf-outfile-zip.c
index 98d8158..90defb8 100644
--- a/gsf/gsf-outfile-zip.c
+++ b/gsf/gsf-outfile-zip.c
@@ -124,7 +124,7 @@ gsf_outfile_zip_constructor (GType type,
construct_params));
if (!zip->entry_name) {
- zip->vdir = gsf_vdir_new ("", TRUE, NULL);
+ zip->vdir = gsf_zip_vdir_new ("", TRUE, NULL);
zip->root_order = g_ptr_array_new ();
zip->root = zip;
@@ -592,7 +592,7 @@ gsf_outfile_zip_new_child (GsfOutfile *parent,
params);
gsf_property_settings_free (params, n_params);
- child->vdir = gsf_vdir_new (name, is_dir, NULL);
+ child->vdir = gsf_zip_vdir_new (name, is_dir, NULL);
/* FIXME: It isn't clear what encoding name is in. */
display_name = g_filename_display_name (name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]