From: Jordan Lee <jordan@transmissionbt.com>
Date: Fri, 24 Jun 2011 18:16:12 +0000 (+0000)
Subject: (trunk gtk) #4308 "Open with Transmission from Firefox doesn't work since Transmissio... 
X-Git-Tag: 2.32~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=caeeb7e94cd443cb5ef2d75c33d030f892728585;p=transmission

(trunk gtk) #4308 "Open with Transmission from Firefox doesn't work since Transmission 2.31" -- added support for uri-formmatted filenames being passed in via the command line
---

diff --git a/gtk/main.c b/gtk/main.c
index e0892c9e3..74bc7bf37 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -584,15 +584,24 @@ checkfilenames( int argc, char **argv )
 
     for( i=0; i<argc; ++i )
     {
-        if( gtr_is_supported_url( argv[i] ) || gtr_is_magnet_link( argv[i] ) )
+        const char * arg = argv[i];
+
+        if( gtr_is_supported_url( arg ) || gtr_is_magnet_link( arg ) )
         {
-            ret = g_slist_prepend( ret, g_strdup( argv[i] ) );
+            ret = g_slist_prepend( ret, g_strdup( arg ) );
         }
         else /* local file */
         {
-            char * filename = g_path_is_absolute( argv[i] )
-                            ? g_strdup ( argv[i] )
-                            : g_build_filename( pwd, argv[i], NULL );
+            char * filename;
+
+            if( g_path_is_absolute( arg ) )
+                filename = g_strdup( arg );
+            else {
+                filename = g_filename_from_uri( arg, NULL, NULL );
+
+                if( filename == NULL )
+                    filename = g_build_filename( pwd, arg, NULL );
+            }
 
             if( g_file_test( filename, G_FILE_TEST_EXISTS ) )
                 ret = g_slist_prepend( ret, filename );