applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

populate the VFS file info fields properly so that nautilus shows e.g.

Browse source 
2007-02-14  Jens Granseuer  <jensgr@gmx.net>

	* theme-method.c: (fill_info_struct), (do_read_directory): populate the
	VFS file info fields properly so that nautilus shows e.g. read-only
	emblems in themes:// (fixes bug #145175)

svn path=/trunk/; revision=7296
This commit is contained in:
Jens Granseuer 2007-02-14 18:23:34 +00:00 • committed by Jens Granseuer
parent be5dce4b64
commit 17ec46ecb3
2 changed files with 26 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

6
vfs-methods/themus/ChangeLog
View file

@ -1,3 +1,9 @@
2007-02-14 Jens Granseuer <jensgr@gmx.net>
* theme-method.c: (fill_info_struct), (do_read_directory): populate the
VFS file info fields properly so that nautilus shows e.g. read-only
emblems in themes:// (fixes bug #145175)
2007-02-07 Jens Granseuer <jensgr@gmx.net>
Based on a patch by: Chistian Persch <chpe@svn.gnome.org>

66
vfs-methods/themus/theme-method.c
View file

@ -159,59 +159,26 @@ fill_info_struct (GnomeVFSFileInfo *file_info, GnomeVFSFileInfoOptions options,
GnomeThemeMetaInfo *theme)
{
GnomeVFSURI *theme_uri;
GnomeVFSFileInfo *info;
GnomeVFSResult result;
theme_uri = gnome_vfs_uri_new (theme->path);
info = gnome_vfs_file_info_new ();
result = gnome_vfs_get_file_info_uri (theme_uri, info, options);
result = gnome_vfs_get_file_info_uri (theme_uri, file_info, options);
gnome_vfs_uri_unref (theme_uri);
if (result == GNOME_VFS_OK)
{
g_free(file_info->name);
g_free (file_info->name);
file_info->name = g_strdup (theme->readable_name);
file_info->uid = info->uid;
file_info->gid = info->gid;
file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_SYMLINK_NAME;
g_free (file_info->symlink_name);
file_info->symlink_name = NULL;
GNOME_VFS_FILE_INFO_SET_SYMLINK (file_info, FALSE);
file_info->type = GNOME_VFS_FILE_TYPE_REGULAR;
g_free (file_info->mime_type);
file_info->mime_type = g_strdup ("application/x-gnome-theme-installed");
file_info->valid_fields |=
GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE;
file_info->type = GNOME_VFS_FILE_TYPE_REGULAR;
file_info->valid_fields |=
GNOME_VFS_FILE_INFO_FIELDS_TYPE;
if (info->valid_fields || GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS)
{
file_info->permissions = info->permissions;
file_info->valid_fields |=
GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS;
}
if (info->valid_fields || GNOME_VFS_FILE_INFO_FIELDS_ATIME)
{
file_info->atime = info->atime;
file_info->valid_fields |=
GNOME_VFS_FILE_INFO_FIELDS_ATIME;
}
if (info->valid_fields || GNOME_VFS_FILE_INFO_FIELDS_CTIME)
{
file_info->ctime = info->ctime;
file_info->valid_fields |=
GNOME_VFS_FILE_INFO_FIELDS_CTIME;
}
if (info->valid_fields || GNOME_VFS_FILE_INFO_FIELDS_SIZE)
{
file_info->size = info->size;
file_info->valid_fields |=
GNOME_VFS_FILE_INFO_FIELDS_SIZE;
}
gnome_vfs_uri_unref (theme_uri);
gnome_vfs_file_info_unref (info);
file_info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE;
}
return result;
@ -276,10 +243,10 @@ do_read_directory(GnomeVFSMethod *method,
GnomeVFSFileInfo *file_info,
GnomeVFSContext *context)
{
GList *theme;
theme = ((ThemeHandle*)(method_handle))->theme;
ThemeHandle *handle = (ThemeHandle *) method_handle;
GList *theme = handle->theme;
if (!((ThemeHandle*)(method_handle))->seen_dotdirectory)
if (!handle->seen_dotdirectory)
{
g_free (file_info->name);
file_info->name = g_strdup (".directory");
@ -291,7 +258,7 @@ do_read_directory(GnomeVFSMethod *method,
GNOME_VFS_PERM_GROUP_READ |
GNOME_VFS_PERM_OTHER_READ;
file_info->valid_fields |= GNOME_VFS_FILE_INFO_FIELDS_PERMISSIONS;
((ThemeHandle*)(method_handle))->seen_dotdirectory = TRUE;
handle->seen_dotdirectory = TRUE;
return GNOME_VFS_OK;
}
@ -300,9 +267,10 @@ do_read_directory(GnomeVFSMethod *method,
return GNOME_VFS_ERROR_EOF;
}
fill_info_struct (file_info, 0, (GnomeThemeMetaInfo*)(theme->data));
fill_info_struct (file_info, handle->options,
(GnomeThemeMetaInfo *) theme->data);
((ThemeHandle*)(method_handle))->theme = ((ThemeHandle*)(method_handle))->theme->next;
handle->theme = handle->theme->next;
return GNOME_VFS_OK;
}