diff options
author | Sebastien Estienne <sebastien.estienne@gmail.com> | 2007-03-27 08:22:07 +0000 |
---|---|---|
committer | Sebastien Estienne <sebastien.estienne@gmail.com> | 2007-03-27 08:22:07 +0000 |
commit | 42c2bb129f9d1704d6e087f3e866825e2c1d16e8 (patch) | |
tree | 5fb348c9c9bca911ba5f3e0c44e8b39005be4be1 | |
parent | e93bfcd9e863a2fbc2160afbb70d60f9506eaf91 (diff) |
* add support for gobby
* bump version number
git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@139 3be567f1-68ff-0310-b24a-ad7cc433fd2f
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | icons/24x24/Makefile.am | 1 | ||||
-rw-r--r-- | icons/24x24/_lobby._tcp.png | bin | 0 -> 1314 bytes | |||
-rw-r--r-- | icons/48x48/Makefile.am | 1 | ||||
-rw-r--r-- | icons/48x48/_lobby._tcp.png | bin | 0 -> 3251 bytes | |||
-rw-r--r-- | plugins/Makefile.am | 7 | ||||
-rw-r--r-- | plugins/obby.py.in | 30 |
7 files changed, 40 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 73155ba..571364e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([service-discovery-applet],[0.4.4],[sebastien (dot) estienne (at) gmail (dot) com]) +AC_INIT([service-discovery-applet],[0.4.5],[sebastien (dot) estienne (at) gmail (dot) com]) AC_CONFIG_SRCDIR([src/service-discovery-applet.in]) AM_INIT_AUTOMAKE([foreign 1.9 -Wall]) AC_CONFIG_MACRO_DIR([common]) diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am index 079c333..dba7b3e 100644 --- a/icons/24x24/Makefile.am +++ b/icons/24x24/Makefile.am @@ -6,6 +6,7 @@ icons_DATA = \ _sftp-ssh._tcp.png \ _ssh._tcp.png \ _rfb._tcp.png \ + _lobby._tcp.png \ service-discovery-applet.png diff --git a/icons/24x24/_lobby._tcp.png b/icons/24x24/_lobby._tcp.png Binary files differnew file mode 100644 index 0000000..a3d54a3 --- /dev/null +++ b/icons/24x24/_lobby._tcp.png diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am index bc53e2f..39a30ca 100644 --- a/icons/48x48/Makefile.am +++ b/icons/48x48/Makefile.am @@ -6,6 +6,7 @@ icons_DATA = \ _sftp-ssh._tcp.png \ _ssh._tcp.png \ _rfb._tcp.png \ + _lobby._tcp.png \ service-discovery-applet.png EXTRA_DIST = $(icons_DATA) diff --git a/icons/48x48/_lobby._tcp.png b/icons/48x48/_lobby._tcp.png Binary files differnew file mode 100644 index 0000000..3877f34 --- /dev/null +++ b/icons/48x48/_lobby._tcp.png diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 893cc07..77b9028 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -4,12 +4,14 @@ plugins = \ gconfterminal.py.in \ nautilus.py.in \ xvncviewer.py.in \ + obby.py.in \ ekiga.py.in plugins_DATA = \ gconfterminal.py \ nautilus.py \ xvncviewer.py \ + obby.py \ ekiga.py gconfterminal.py: gconfterminal.py.in @@ -27,6 +29,11 @@ xvncviewer.py: xvncviewer.py.in -e 's,@toolsdir\@,$(TOOLSDIR),g' \ $< > $@ +obby.py: obby.py.in + sed \ + -e 's,@toolsdir\@,$(TOOLSDIR),g' \ + $< > $@ + ekiga.py: ekiga.py.in sed \ -e 's,@toolsdir\@,$(TOOLSDIR),g' \ diff --git a/plugins/obby.py.in b/plugins/obby.py.in new file mode 100644 index 0000000..bd28182 --- /dev/null +++ b/plugins/obby.py.in @@ -0,0 +1,30 @@ +# -*- coding: UTF-8 -*- +# -*- python -*- +# Copyright (C) 2006 by Sebastien Estienne +# +# This file may be distributed and/or modified under the terms of +# the GNU General Public License version 2 as published by +# the Free Software Foundation. +# This file is distributed without any warranty; without even the implied +# warranty of merchantability or fitness for a particular purpose. +# See "COPYING" in the source distribution for more information. +# +# $Id$ +# + +from sdapplet.pluginutils import * +import subprocess + +class plugin_obby: + def __init__(self): + self.service_type = ["_lobby._tcp"] + self.author = "Sebastien Estienne" + self.description = "Start an obby sessions with Gobby" + + def connect(self, use_host_names, name, stype, hostname, address, port, txts): + cmdline = ["@toolsdir@/exec_wrapper", "gobby", "--join=%s:%s" % (hostname,port) ] + print cmdline + pid = subprocess.Popen(cmdline, close_fds=True).pid + +def load(): + return plugin_obby() |