#1252: support xpras:// and convert tcp connection string to ssl when…

… this is used git-svn-id: https://xpra.org/svn/Xpra/trunk@13106 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Jul 28, 2016 · a72a90e · a72a90e
1 parent 78d35c7
commit a72a90e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/osx/Info.plist b/osx/Info.plist
@@ -65,6 +65,7 @@
         <key>CFBundleURLSchemes</key>
         <array>
             <string>xpra</string>
+            <string>xpras</string>
         </array>
         <key>CFBundleURLName</key>
         <string>Xpra Session</string>

diff --git a/src/win32/xpra.iss b/src/win32/xpra.iss
@@ -43,6 +43,11 @@ Root: HKCR; Subkey: "xpra"; ValueType: "string"; ValueName: "URL Protocol"; Valu
 Root: HKCR; Subkey: "xpra\DefaultIcon"; ValueType: "string"; ValueData: "{app}\Xpra.exe,0"
 Root: HKCR; Subkey: "xpra\shell\open\command"; ValueType: "string"; ValueData: """{app}\Xpra.exe"" ""attach"" ""%1"""
 
+Root: HKCR; Subkey: "xpras"; ValueType: "string"; ValueData: "URL:Custom Protocol"; Flags: uninsdeletekey
+Root: HKCR; Subkey: "xpras"; ValueType: "string"; ValueName: "URL Protocol"; ValueData: ""
+Root: HKCR; Subkey: "xpras\DefaultIcon"; ValueType: "string"; ValueData: "{app}\Xpra.exe,0"
+Root: HKCR; Subkey: "xpras\shell\open\command"; ValueType: "string"; ValueData: """{app}\Xpra.exe"" ""attach"" ""%1"""
+
 [Code]
 function IsAppRunning(const FileName : string): Boolean;
 var

diff --git a/src/xdg/xpra.desktop b/src/xdg/xpra.desktop
@@ -8,4 +8,4 @@ NoDisplay=true
 Type=Application
 StartupNotify=false
 Categories=Network;
-MimeType=x-scheme-handler/xpra;
+MimeType=x-scheme-handler/xpra;x-scheme-handler/xpras;
diff --git a/src/xpra/scripts/main.py b/src/xpra/scripts/main.py
@@ -874,11 +874,13 @@ def ignore(defaults):
 
     #special handling for URL mode:
     #xpra attach xpra://[mode:]host:port/?param1=value1&param2=value2
-    if len(args)==2 and args[0]=="attach" and args[1].startswith("xpra://"):
+    if len(args)==2 and args[0]=="attach" and args[1].startswith("xpra://") or args[1].startswith("xpras://"):
         url = args[1]
         address, params = parse_URL(url)
         for k,v in params.items():
             setattr(options, k, v)
+        if url.startswith("xpras://tcp"):
+            address = "ssl" + address[3:]
         args[1] = address
 
     try: