Updating branch refs/heads/master
to 5b3ef158a43486e8cf0068061ac238f5a8d24ab7 (commit)
from 95d44fbd3077e4bc5082ee8b324a90dcbfbc51b7 (commit)
commit 5b3ef158a43486e8cf0068061ac238f5a8d24ab7
Author: Nick Schermer <[email protected]>
Date: Sat Dec 4 16:11:49 2010 +0100
Set application name for Thunar loop detection.
exo-gio-module/exo-module.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/exo-gio-module/exo-module.c b/exo-gio-module/exo-module.c
index 898d453..3e76411 100644
--- a/exo-gio-module/exo-module.c
+++ b/exo-gio-module/exo-module.c
@@ -62,13 +62,14 @@ struct _KnownSchemes
{
const gchar *pattern;
const gchar *category;
+ const gchar *app_name; /* name of the desktop files we use after gio 2.27
for thunar */
};
static KnownSchemes known_schemes[] =
{
- { "^(https?|ftps?|gopher)$", "WebBrowser" },
- { "^mailto$", "MailReader" },
- { "^(file|trash|ssh)$", "FileManager" }
+ { "^(https?|ftps?|gopher)$", "WebBrowser", "exo-web-browser" },
+ { "^mailto$", "MailReader", "exo-mail-reader" },
+ { "^(file|trash|ssh)$", "FileManager", "exo-file-manager" }
};
@@ -141,7 +142,8 @@ exo_gio_module_get_default_for_uri_scheme
(GDesktopAppInfoLookup *lookup,
{
/* use the exo-helper directly here to avoid possible roundtrips
with exo-open */
command = g_strconcat (EXO_HELPER_LAUNCH, known_schemes[i].category,
NULL);
- info = g_app_info_create_from_commandline (command, NULL,
G_APP_INFO_CREATE_SUPPORTS_URIS, &error);
+ info = g_app_info_create_from_commandline (command,
known_schemes[i].app_name,
+
G_APP_INFO_CREATE_SUPPORTS_URIS, &error);
if (G_UNLIKELY (info == NULL))
{
/* show error */
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
