* small fix everywhere

git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@33 3be567f1-68ff-0310-b24a-ad7cc433fd2f

6 files changed, 40 insertions, 5 deletions

diff --git a/INSTALL b/INSTALL
index 315415f..e9ee4a9 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-./configure --prefix=/usr --sysconfdir=/etc && make && make install
+./configure --prefix=/usr --sysconfdir=/etc && make && sudo make install
diff --git a/README b/README
index a9a8181..0cc8bc6 100644
--- a/README
+++ b/README
@@ -1,3 +1,9 @@
+requirements:
+ avahi >= 0.5
+python2.4-gnome2
+python2.4-gnome2
+
+
 You should may have to log out, or restart gnome-panel before being able to use your new applet.
 
 You should test that the applet is functionning with the following command:
diff --git a/TODO b/TODO
index b193144..1123ac5 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,10 @@
 * fix ipv6
-* option to not browse our own services
 * finnish python's plugins
-* check adding services
 * fix transparency when right-clicking
+* nicer icons in error notifications
+
+fix:
+** (Service discovery applet:29450): WARNING **: need to free the control here
+
+./service-discovery-applet:90: GtkWarning: Attempting to add a widget with type GtkEventBox to a PanelApplet, but as a GtkBin subclass a PanelApplet can only contain one widget at a time; it already contains a widget of type GtkEventBox
+  self.applet.add(self.eb)
diff --git a/actions/services/Makefile.am b/actions/services/Makefile.am
index 2a28c48..50aa099 100644
--- a/actions/services/Makefile.am
+++ b/actions/services/Makefile.am
@@ -2,4 +2,12 @@ servicesdir = $(ACTIONSDIR)/services
 services_SCRIPTS = \
 	__init__.py
 
-EXTRA_DIST = $(services_SCRIPTS)
+__init__.py: __init__.py.in
+	sed \
+	-e 's,@PYTHON\@,$(PYTHON),g' \
+	$< > $@
+	chmod +x $@
+
+
+
+EXTRA_DIST = __init__.py.in
diff --git a/actions/services/__init__.py b/actions/services/__init__.py.in
index 748e53c..dc64db4 100755
--- a/actions/services/__init__.py
+++ b/actions/services/__init__.py.in
@@ -1,4 +1,16 @@
-#!/usr/bin/python
+#!@PYTHON@
+# -*-python-*-
+# Copyright (C) 2005 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$
+#
 
 import subprocess
 import gnome
diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in
index 088d14b..41d9445 100755
--- a/src/service-discovery-applet.in
+++ b/src/service-discovery-applet.in
@@ -201,8 +201,12 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
 	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"
 
         if self.zc_services.has_key((interface, protocol, name, type, domain)):
             self.zc_types[type].remove(self.zc_services[(interface, protocol, name, type, domain)])