improve uri handler

data/yad.1

@@ -171,7 +171,7 @@ All commands runs unter specified interpreter. Default is \fIbash -c '%s'\fP. Th
 Otherwise command will be appended to the end of command line.
 .TP
 .B \-\-uri-handler=\fICMD\fP
-Use \fICMD\fP as uri handler. By default yad uses \fIopen-command\fP parameter from settings. URI adds to the end of specified command-line.
+Use \fICMD\fP as uri handler. By default yad uses \fIopen-command\fP parameter from settings. URI replace \fI%s\fP in command string or adds as a last part of command line.
 .TP
 .B \-\-borders=\fINUM\fP
 Set dialog window borders.

src/util.c

@@ -789,7 +789,10 @@ open_uri (const gchar *uri)
   if (!uri && !uri[0])
     return;
 
-  cmdline = g_strdup_printf ("%s '$s'", options.data.uri_handler, uri);
+  if (g_strstr_len (options.data.uri_handler, -1, "%s") != NULL)
+    cmdline = g_strdup_printf (options.data.uri_handler, uri);
+  else
+    cmdline = g_strdup_printf ("%s '$s'", options.data.uri_handler, uri);
   run_command_async (cmdline);
   g_free (cmdline);
 }