Commit fa558d00 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Support desktop file key X-GIO-NoFuse which disables use of fuse pathnames

2009-02-26  Alexander Larsson  <alexl@redhat.com>

	* gdesktopappinfo.c:
	Support desktop file key X-GIO-NoFuse which disables
	use of fuse pathnames for %u and %U arguments.



svn path=/trunk/; revision=7914
parent a657a8e5
2009-02-26 Alexander Larsson <alexl@redhat.com>
* gdesktopappinfo.c:
Support desktop file key X-GIO-NoFuse which disables
use of fuse pathnames for %u and %U arguments.
2009-02-25 Alexander Larsson <alexl@redhat.com> 2009-02-25 Alexander Larsson <alexl@redhat.com>
Bug 570073 – Add support for reading filesystems on Interix Bug 570073 – Add support for reading filesystems on Interix
......
...@@ -98,6 +98,7 @@ struct _GDesktopAppInfo ...@@ -98,6 +98,7 @@ struct _GDesktopAppInfo
guint hidden : 1; guint hidden : 1;
guint terminal : 1; guint terminal : 1;
guint startup_notify : 1; guint startup_notify : 1;
guint no_fuse : 1;
/* FIXME: what about StartupWMClass ? */ /* FIXME: what about StartupWMClass ? */
}; };
...@@ -256,6 +257,7 @@ g_desktop_app_info_new_from_keyfile (GKeyFile *key_file) ...@@ -256,6 +257,7 @@ g_desktop_app_info_new_from_keyfile (GKeyFile *key_file)
info->path = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_PATH, NULL); info->path = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_PATH, NULL);
info->terminal = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TERMINAL, NULL) != FALSE; info->terminal = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_TERMINAL, NULL) != FALSE;
info->startup_notify = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, NULL) != FALSE; info->startup_notify = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, NULL) != FALSE;
info->no_fuse = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, "X-GIO-NoFuse", NULL) != FALSE;
info->hidden = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_HIDDEN, NULL) != FALSE; info->hidden = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_HIDDEN, NULL) != FALSE;
info->icon = NULL; info->icon = NULL;
...@@ -573,20 +575,23 @@ expand_macro (char macro, ...@@ -573,20 +575,23 @@ expand_macro (char macro,
* running or the URI doesn't have a POSIX file path via FUSE * running or the URI doesn't have a POSIX file path via FUSE
* we'll just pass the URI. * we'll just pass the URI.
*/ */
switch (macro) force_file_uri_macro = macro;
force_file_uri = FALSE;
if (!info->no_fuse)
{ {
case 'u': switch (macro)
force_file_uri_macro = 'f'; {
force_file_uri = TRUE; case 'u':
break; force_file_uri_macro = 'f';
case 'U': force_file_uri = TRUE;
force_file_uri_macro = 'F'; break;
force_file_uri = TRUE; case 'U':
break; force_file_uri_macro = 'F';
default: force_file_uri = TRUE;
force_file_uri_macro = macro; break;
force_file_uri = FALSE; default:
break; break;
}
} }
switch (macro) switch (macro)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment