forwardport previous efreet desktop command commit

ticket #2174

SVN revision: 82390

diff --git a/ChangeLog b/ChangeLog
index bd44362..655639c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-08 Mike Blumenkrantz
+
+        * Fix efreet desktop command parsing of https
+
 2013-01-07 Sung W. Park (sung_)
 
        * Pulled out evas gl backend binary shader file caching code from 

diff --git a/NEWS b/NEWS
index 15a0fd0..b685c4d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -103,3 +103,4 @@ Fixes:
     * Fix mask write lines to not choose too small segments
     * Fix ecore_con case where freeing server double-frees clients
     * Fix build of Evas XCB backend
+    * Fix efreet desktop command parsing of https

diff --git a/src/lib/efreet/efreet_desktop_command.c b/src/lib/efreet/efreet_desktop_command.c
index beeac76..075bdae 100644 (file)
--- a/src/lib/efreet/efreet_desktop_command.c
+++ b/src/lib/efreet/efreet_desktop_command.c
@@ -623,7 +623,7 @@ efreet_desktop_command_file_process(Efreet_Desktop_Command *command, const char
     f->command = command;
 
     /* handle uris */
-    if (!strncmp(file, "http://", 7) || !strncmp(file, "ftp://", 6))
+    if ((!strncmp(file, "http", 4) && (!strncmp(file + 4, "://", 3) || !strncmp(file + 4, "s://", 4))) || !strncmp(file, "ftp://", 6))
     {
         uri = file;
         base = ecore_file_file_get(file);