summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoss Vandegrift <ross@kallisti.us>2020-05-14 11:18:45 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-05-14 11:23:04 +0100
commit765d8e1d3dd3f8bf3b741772fd8c3a56d024c07f (patch)
treee23dc50d9d4d84e0eb8029f7b2aaedd755f5045a /src
parentd2e5fdc9659b6879900d3e4a4226c8b9f6a4e759 (diff)
Don't set x-scheme-handler/file for File manager app.
Summary: File managers should handle inode/directory, not x-scheme-handler/file. Registering x-scheme-handler/file means that the file manager app should open all "file://" URLs. And because of some details of the FDO spec, scheme handlers override mime-type handlers. As a result, other desktop environments can start using a file manager to open all local files. fixes T7521 Reviewers: devilhorns, raster Reviewed By: raster Subscribers: cedric, zmike Tags: #enlightenment-git Maniphest Tasks: T7521 Differential Revision: https://phab.enlightenment.org/D10244
Diffstat (limited to 'src')
-rw-r--r--src/bin/e_open.c2
-rw-r--r--src/modules/conf_applications/e_int_config_defapps.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bin/e_open.c b/src/bin/e_open.c
index 0960bddce..602db5a80 100644
--- a/src/bin/e_open.c
+++ b/src/bin/e_open.c
@@ -443,7 +443,7 @@ static const struct type_mime
443 /* {"browser", "x-scheme-handler/http"}, */ 443 /* {"browser", "x-scheme-handler/http"}, */
444 {"mail", "x-scheme-handler/mailto"}, 444 {"mail", "x-scheme-handler/mailto"},
445 /* {"terminal", NULL}, */ 445 /* {"terminal", NULL}, */
446 {"filemanager", "x-scheme-handler/file"}, 446 {"filemanager", "inode/directory"},
447 {"image", "image/jpeg"}, 447 {"image", "image/jpeg"},
448 {"video", "video/x-mpeg"}, 448 {"video", "video/x-mpeg"},
449 {"music", "audio/mp3"}, 449 {"music", "audio/mp3"},
diff --git a/src/modules/conf_applications/e_int_config_defapps.c b/src/modules/conf_applications/e_int_config_defapps.c
index f4b5f0583..fd394c58a 100644
--- a/src/modules/conf_applications/e_int_config_defapps.c
+++ b/src/modules/conf_applications/e_int_config_defapps.c
@@ -131,7 +131,7 @@ _create_data(E_Config_Dialog *cfd EINA_UNUSED)
131 if (s) cfdata->browser_desktop = eina_stringshare_add(s); 131 if (s) cfdata->browser_desktop = eina_stringshare_add(s);
132 s = efreet_ini_string_get(myini, "x-scheme-handler/mailto"); 132 s = efreet_ini_string_get(myini, "x-scheme-handler/mailto");
133 if (s) cfdata->mailto_desktop = eina_stringshare_add(s); 133 if (s) cfdata->mailto_desktop = eina_stringshare_add(s);
134 s = efreet_ini_string_get(myini, "x-scheme-handler/file"); 134 s = efreet_ini_string_get(myini, "inode/directory");
135 if (s) cfdata->file_desktop = eina_stringshare_add(s); 135 if (s) cfdata->file_desktop = eina_stringshare_add(s);
136 s = efreet_ini_string_get(myini, "x-scheme-handler/trash"); 136 s = efreet_ini_string_get(myini, "x-scheme-handler/trash");
137 if (s) cfdata->trash_desktop = eina_stringshare_add(s); 137 if (s) cfdata->trash_desktop = eina_stringshare_add(s);
@@ -385,7 +385,7 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata)
385 efreet_ini_string_set(cfdata->ini, "x-scheme-handler/mailto", 385 efreet_ini_string_set(cfdata->ini, "x-scheme-handler/mailto",
386 cfdata->mailto_desktop); 386 cfdata->mailto_desktop);
387 if ((cfdata->file_desktop) && (cfdata->file_desktop[0])) 387 if ((cfdata->file_desktop) && (cfdata->file_desktop[0]))
388 efreet_ini_string_set(cfdata->ini, "x-scheme-handler/file", 388 efreet_ini_string_set(cfdata->ini, "inode/directory",
389 cfdata->file_desktop); 389 cfdata->file_desktop);
390 if ((cfdata->trash_desktop) && (cfdata->trash_desktop[0])) 390 if ((cfdata->trash_desktop) && (cfdata->trash_desktop[0]))
391 efreet_ini_string_set(cfdata->ini, "x-scheme-handler/trash", 391 efreet_ini_string_set(cfdata->ini, "x-scheme-handler/trash",