diff options
author | Sebastien Estienne <sebastien.estienne@gmail.com> | 2005-10-04 16:14:23 +0000 |
---|---|---|
committer | Sebastien Estienne <sebastien.estienne@gmail.com> | 2005-10-04 16:14:23 +0000 |
commit | b43e6b19808b4fb0ea7fc7ecf7670888c094cf15 (patch) | |
tree | 14d2434c0b655e8deb8d2ea237690ac74556ee24 | |
parent | 1180ca5544328d79ae4032a1855d2ec788ecda4d (diff) |
* remove old sh scripts system
* support avahi 0.4 by skipping exceptions on IsLocal
git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@34 3be567f1-68ff-0310-b24a-ad7cc433fd2f
-rw-r--r-- | Makefile.am | 1 | ||||
-rw-r--r-- | configure.ac | 7 | ||||
-rw-r--r-- | scripts/Makefile.am | 9 | ||||
-rwxr-xr-x | scripts/_ftp._tcp.sh | 16 | ||||
-rwxr-xr-x | scripts/_http._tcp.sh | 21 | ||||
-rwxr-xr-x | scripts/_https._tcp.sh | 21 | ||||
-rwxr-xr-x | scripts/_sftp-ssh._tcp.sh | 30 | ||||
-rwxr-xr-x | scripts/_ssh._tcp.sh | 29 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rwxr-xr-x | src/service-discovery-applet.in | 33 |
10 files changed, 13 insertions, 156 deletions
diff --git a/Makefile.am b/Makefile.am index 8a266ee..2d0cd8c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,6 @@ SUBDIRS = \ src \ icons \ schemas \ - scripts \ actions \ servers diff --git a/configure.ac b/configure.ac index 8dfeaed..fe00b07 100644 --- a/configure.ac +++ b/configure.ac @@ -19,12 +19,6 @@ AM_CHECK_PYMOD(avahi,,,[AC_MSG_ERROR(Could not find Python module avahi)]) # AM_CHECK_PYMOD(gnomeapplet,,,[AC_MSG_ERROR(Could not find Python module gnomeapplet)]) dnl ======================================================== -dnl Directory where services' scripts will be installed -dnl ======================================================== -SCRIPTSDIR="${datadir}/${PACKAGE}/scripts/" -AC_SUBST(SCRIPTSDIR) - -dnl ======================================================== dnl Directory where services' actions will be installed dnl ======================================================== ACTIONSDIR="${datadir}/${PACKAGE}/actions/" @@ -55,7 +49,6 @@ AC_CONFIG_FILES([ icons/24x24/Makefile icons/48x48/Makefile schemas/Makefile - scripts/Makefile servers/Makefile actions/Makefile actions/services/Makefile diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index 9bcd0ed..0000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -scriptsdir = $(SCRIPTSDIR) -scripts_SCRIPTS = \ - _http._tcp.sh \ - _https._tcp.sh \ - _ftp._tcp.sh \ - _sftp-ssh._tcp.sh \ - _ssh._tcp.sh - -EXTRA_DIST = $(scripts_SCRIPTS) diff --git a/scripts/_ftp._tcp.sh b/scripts/_ftp._tcp.sh deleted file mode 100755 index 4ff8006..0000000 --- a/scripts/_ftp._tcp.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -TYPE=`basename $0` -NAME=$1 -HOSTNAME=$2 -ADDRESS=$3 -PORT=$4 -TXTS=$5 - -for TXT in $TXTS -do - eval TXT_$TXT -done - -HANDLER=`echo $TYPE | cut -f 1 -d "." | cut -f 2 -d "_"` - -gnome-open "$HANDLER://$ADDRESS:$PORT/$TXT_path" diff --git a/scripts/_http._tcp.sh b/scripts/_http._tcp.sh deleted file mode 100755 index d196ea6..0000000 --- a/scripts/_http._tcp.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -TYPE=`basename $0` -NAME=$1 -HOSTNAME=$2 -ADDRESS=$3 -PORT=$4 -TXTS=$5 - -for TXT in $TXTS -do - eval TXT_$TXT -done - -HANDLER=`echo $TYPE | cut -f 1 -d "." | cut -f 2 -d "_"` - -if [ ! -z "$TXT_path" ] -then - path=`echo $TXT_path | sed -e 's/^\///g'` -fi - -gnome-open "$HANDLER://$ADDRESS:$PORT/$path" diff --git a/scripts/_https._tcp.sh b/scripts/_https._tcp.sh deleted file mode 100755 index d196ea6..0000000 --- a/scripts/_https._tcp.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -TYPE=`basename $0` -NAME=$1 -HOSTNAME=$2 -ADDRESS=$3 -PORT=$4 -TXTS=$5 - -for TXT in $TXTS -do - eval TXT_$TXT -done - -HANDLER=`echo $TYPE | cut -f 1 -d "." | cut -f 2 -d "_"` - -if [ ! -z "$TXT_path" ] -then - path=`echo $TXT_path | sed -e 's/^\///g'` -fi - -gnome-open "$HANDLER://$ADDRESS:$PORT/$path" diff --git a/scripts/_sftp-ssh._tcp.sh b/scripts/_sftp-ssh._tcp.sh deleted file mode 100755 index 5ecf95f..0000000 --- a/scripts/_sftp-ssh._tcp.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -TYPE=`basename $0` -NAME=$1 -HOSTNAME=$2 -ADDRESS=$3 -PORT=$4 -TXTS=$5 - -for TXT in $TXTS -do - eval TXT_$TXT -done - -if [ ! -z "$TXT_u" ] -then - USER_NAME="-l $TXT_u" -else - USER_NAME=`zenity --entry --text "Login :"` - if [ ! -z "$USER_NAME" ] - then - USER_NAME="$USER_NAME@" - fi -fi - -if [ ! -z "$TXT_path" ] -then - path=/`echo $TXT_path | sed -e 's/^\///g'` -fi - -gnome-terminal --tab -t "$NAME" -e "sftp -oPort=$PORT $USER_NAME$ADDRESS:$path" diff --git a/scripts/_ssh._tcp.sh b/scripts/_ssh._tcp.sh deleted file mode 100755 index 892d354..0000000 --- a/scripts/_ssh._tcp.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -NAME=$1 -HOSTNAME=$2 -ADDRESS=$3 -PORT=$4 -TXTS=$5 - -for TXT in $TXTS -do - eval TXT_$TXT -done - -if [ ! -z "$TXT_u" ] -then - USER_NAME="-l $TXT_u" -else - USER_NAME=`zenity --entry --text "Login :"` - if [ ! -z "$USER_NAME" ] - then - USER_NAME="-l $USER_NAME" - fi -fi - -if [ ! -z $PORT ] -then - PORT="-p $PORT" -fi - -gnome-terminal --tab -t "$NAME" -e "ssh $USER_NAME $PORT $ADDRESS" diff --git a/src/Makefile.am b/src/Makefile.am index 49b5bec..65ea593 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,7 +18,6 @@ service-discovery-applet: service-discovery-applet.in -e 's,@PYTHON\@,$(PYTHON),g' \ -e 's,@version\@,$(VERSION),g' \ -e 's,@iconsdir\@,$(ICONSDIR),g' \ - -e 's,@scriptsdir\@,$(SCRIPTSDIR),g' \ -e 's,@actionsdir\@,$(ACTIONSDIR),g' \ $< > $@ chmod +x $@ @@ -29,7 +28,6 @@ service-discovery-config: service-discovery-config.in -e 's,@version\@,$(VERSION),g' \ -e 's,@iconsdir\@,$(ICONSDIR),g' \ -e 's,@interfacesdir\@,$(INTERFACESDIR),g' \ - -e 's,@scriptsdir\@,$(SCRIPTSDIR),g' \ -e 's,@actionsdir\@,$(ACTIONSDIR),g' \ $< > $@ chmod +x $@ diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index 41d9445..4331f73 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -145,16 +145,6 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): txts = avahi.txt_array_to_string_array(txt) txts = services.pair_to_dict(txts) services.handle(name, type, host, address, port, txts) -# if os.path.exists("@scriptsdir@/%s.sh" % type): -# cmd = [] -# cmd.append("@scriptsdir@/%s.sh" % type) -# cmd.append("%s" % name) -# cmd.append("%s" % host) -# cmd.append("%s" % address) -# cmd.append("%i" % port) -# cmd.append('%s' % " ".join(avahi.txt_array_to_string_array(txt))) -# print cmd -# pid = subprocess.Popen(cmd).pid def print_error(self, err): print "Error:", str(err) @@ -165,9 +155,12 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): def new_service(self, interface, protocol, name, type, domain): print "Found service '%s' of type '%s' in domain '%s' on %s.%i." % (name, type, domain, self.siocgifname(interface), protocol) - if self.show_local_services == False: - if self.server.IsServiceLocal( interface, protocol, name, type, domain) == True: - return + try: + if self.show_local_services == False: + if self.server.IsServiceLocal( interface, protocol, name, type, domain) == True: + return + except dbus.dbus_bindings.DBusException: + pass if self.zc_types.has_key(type) == False: menuitem = gtk.ImageMenuItem() @@ -200,13 +193,13 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): def remove_service(self, interface, protocol, name, type, domain): print "Service '%s' of type '%s' in domain '%s' on %s.%i disappeared." % (name, type, domain, self.siocgifname(interface), protocol) - if self.show_local_services == False: - # FIXME avahi bug? - if self.server.IsServiceLocal( interface, protocol, name, type, domain) == True: - print "is local" - return - else: - print "is NOT local" + try: + if self.show_local_services == False: + # FIXME avahi bug? + if self.server.IsServiceLocal( interface, protocol, name, type, domain) == True: + return + except dbus.dbus_bindings.DBusException: + pass if self.zc_services.has_key((interface, protocol, name, type, domain)): self.zc_types[type].remove(self.zc_services[(interface, protocol, name, type, domain)]) |