Skip to content

Commit

Permalink
* support launching xpra as url handler for xpra://mode:host:port
Browse files Browse the repository at this point in the history
* also move xdg bits to a dedicated dir
* rpm and manifest updates

git-svn-id: https://xpra.org/svn/Xpra/trunk@3271 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed May 4, 2013
1 parent e6bf618 commit 3ed89e0
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 6 deletions.
13 changes: 9 additions & 4 deletions src/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
include COPYING NEWS *README
include xpra/x11/lowlevel/constants.pxi
include COPYING NEWS README
include xpra/x11/bindings/*.pxi
include xpra/x11/bindings/*.pxd
include xpra/x11/bindings/constants.txt
include xpra/x11/gtk_x11/*.pxi
include xpra/x11/gtk_x11/*.pxd
include xpra/x11/gtk_x11/constants.txt
include xpra/codecs/x264/*.h
include xpra/codecs/vpx/*.h
include *.desktop
include *.png
include xpra.png
recursive-include man *
recursive-include patches *
recursive-include etc *
recursive-include xdg *
recursive-include icons *
global-include *.py *.txt
global-exclude *~ #* *.orig *.bak *.rej
Expand Down
4 changes: 2 additions & 2 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,8 @@ def toggle_packages(enabled, *package_names):
("share/man/man1", man_pages),
("share/xpra", ["README", "COPYING"]),
("share/xpra/icons", glob.glob("icons/*")),
("share/applications", ["xpra_launcher.desktop"]),
("share/icons", ["xpra.png"])
("share/applications", ["xdg/xpra_launcher.desktop", "xdg/xpra.desktop"]),
("share/icons", ["xdg/xpra.png"])
]
if webp_ENABLED:
data_files.append(('share/xpra/webm', ["xpra/codecs/webm/LICENSE"]))
Expand Down
11 changes: 11 additions & 0 deletions src/xdg/xpra.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[Desktop Entry]
Name=Xpra
Comment=Connect to an Xpra session
Exec=xpra attach %u
Icon=xpra
Terminal=false
NoDisplay=true
Type=Application
StartupNotify=false
Categories=Network;
MimeType=x-scheme-handler/xpra;
Binary file added src/xdg/xpra.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/xdg/xpra_launcher.desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[Desktop Entry]
Name=Xpra Launcher
Comment=Connect to an Xpra session
TryExec=xpra_launcher
Exec=xpra_launcher
Icon=xpra
Terminal=false
Type=Application
StartupNotify=false
Categories=Network;
MimeType=text/x-xpraconfig;
2 changes: 2 additions & 0 deletions src/xpra/scripts/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,8 @@ def sigusr2(*args):


def parse_display_name(error_cb, opts, display_name):
if display_name.startswith("xpra://"):
display_name = display_name[len("xpra://"):]
desc = {"display_name" : display_name}
if display_name.startswith("ssh:") or display_name.startswith("ssh/"):
separator = display_name[3] # ":" or "/"
Expand Down

0 comments on commit 3ed89e0

Please sign in to comment.