packaging/ostree
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop some bits from libotutil that are now merged in libgsystem

Browse Source
This commit is contained in:
Colin Walters committed 2012-11-29 16:24:49 -05:00
1 parent d1ddfc973c
commit 5761733218
19 files changed
+104 -205
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/libostree/ostree-repo-file.c
+6 -6
View File
@@ -105,7 +105,7 @@ set_error_noent (GFile *self, GError **error)
{
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
"No such file or directory: %s",
ot_gfile_get_path_cached (self));
gs_file_get_path_cached (self));
return FALSE;
}
@@ -473,7 +473,7 @@ ostree_repo_file_get_uri (GFile *file)
char *uri_path;
char *ret;
path = ot_gfile_get_path_cached (file);
path = gs_file_get_path_cached (file);
uri_path = g_filename_to_uri (path, NULL, NULL);
g_assert (g_str_has_prefix (uri_path, "file://"));
ret = g_strconcat ("ostree://", self->commit, uri_path+strlen("file://"), NULL);
@@ -565,8 +565,8 @@ ostree_repo_file_prefix_matches (GFile *parent,
const char *parent_path;
const char *descendant_path;
parent_path = ot_gfile_get_path_cached (parent);
descendant_path = ot_gfile_get_path_cached (descendant);
parent_path = gs_file_get_path_cached (parent);
descendant_path = gs_file_get_path_cached (descendant);
remainder = match_prefix (descendant_path, parent_path);
if (remainder != NULL && G_IS_DIR_SEPARATOR (*remainder))
return TRUE;
@@ -581,8 +581,8 @@ ostree_repo_file_get_relative_path (GFile *parent,
const char *parent_path;
const char *descendant_path;
parent_path = ot_gfile_get_path_cached (parent);
descendant_path = ot_gfile_get_path_cached (descendant);
parent_path = gs_file_get_path_cached (parent);
descendant_path = gs_file_get_path_cached (descendant);
remainder = match_prefix (descendant_path, parent_path);
if (remainder != NULL && G_IS_DIR_SEPARATOR (*remainder))