summaryrefslogtreecommitdiff
path: root/src/lib/efreet/efreet_desktop_command.c
diff options
context:
space:
mode:
authorKai Huuhko <kai.huuhko@gmail.com>2014-05-19 15:48:41 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2014-05-19 15:48:41 +0900
commit78c9a82a142f619ccd0957957351fe0e573de76c (patch)
tree3eeb6a01f46cb0ecc08e01e225dfcbe02384be74 /src/lib/efreet/efreet_desktop_command.c
parentf691b712841bc64e6267cd70cf28782c743bb916 (diff)
efreet: Handle URIs in a more generic way
Summary: Fixes T1219 Reviewers: englebass CC: cedric Maniphest Tasks: T1219 Differential Revision: https://phab.enlightenment.org/D865
Diffstat (limited to 'src/lib/efreet/efreet_desktop_command.c')
-rw-r--r--src/lib/efreet/efreet_desktop_command.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/efreet/efreet_desktop_command.c b/src/lib/efreet/efreet_desktop_command.c
index df313a8..1e4c51d 100644
--- a/src/lib/efreet/efreet_desktop_command.c
+++ b/src/lib/efreet/efreet_desktop_command.c
@@ -624,14 +624,7 @@ efreet_desktop_command_file_process(Efreet_Desktop_Command *command, const char
624 f->command = command; 624 f->command = command;
625 625
626 /* handle uris */ 626 /* handle uris */
627 if ((!strncmp(file, "http", 4) && (!strncmp(file + 4, "://", 3) || !strncmp(file + 4, "s://", 4))) || !strncmp(file, "ftp://", 6)) 627 if (!strncmp(file, "file:", 5))
628 {
629 uri = file;
630 base = ecore_file_file_get(file);
631
632 nonlocal = 1;
633 }
634 else if (!strncmp(file, "file:", 5))
635 { 628 {
636 file = efreet_desktop_command_file_uri_process(file); 629 file = efreet_desktop_command_file_uri_process(file);
637 if (!file) 630 if (!file)
@@ -640,6 +633,13 @@ efreet_desktop_command_file_process(Efreet_Desktop_Command *command, const char
640 return NULL; 633 return NULL;
641 } 634 }
642 } 635 }
636 else if (strstr(file, ":"))
637 {
638 uri = file;
639 base = ecore_file_file_get(file);
640
641 nonlocal = 1;
642 }
643 643
644 if (nonlocal) 644 if (nonlocal)
645 { 645 {