[Xfce4-commits] <exo:master> Trash uris might be files too.

[Nick Schermer]

Updating branch refs/heads/master
         to dbd731ff291c5128109546832d25f3b061f5afc0 (commit)
       from a974e2d5feed0ff233d8a1406f0e4f07fc55b6c3 (commit)

commit dbd731ff291c5128109546832d25f3b061f5afc0
Author: Nick Schermer <nick at xfce.org>
Date:   Sat Nov 13 20:04:57 2010 +0100

    Trash uris might be files too.
    
    GIO reports directories in a trash uri as G_FILE_TYPE_DIRECTORY
    so we're cool here.

 exo-open/main.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/exo-open/main.c b/exo-open/main.c
index 9fbfd4e..526a416 100644
--- a/exo-open/main.c
+++ b/exo-open/main.c
@@ -87,8 +87,6 @@ static KnownSchemes known_schemes[] =
 {
   { "^(https?|ftps?|gopher)$", "WebBrowser" },
   { "^mailto$",                "MailReader" },
-  /* no file here, because we handle directories and files differently */
-  { "^(trash)$",               "FileManager" }
 };
 
 
@@ -325,6 +323,9 @@ exo_open_uri (const gchar  *uri,
       file_type = g_file_info_get_file_type (file_info);
       if (file_type == G_FILE_TYPE_DIRECTORY)
         {
+#ifndef NDEBUG
+          g_debug ("file is directory, use filemanager");
+#endif
           /* directories should go fine with a file manager */
           retval = exo_open_launch_category ("FileManager", uri);
           succeed = TRUE;