* cleaning

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

2 files changed, 22 insertions, 24 deletions

diff --git a/configure.ac b/configure.ac
index fe00b07..df2fa4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT([service-discovery-applet],[0.2],[sebastien (dot) estienne (at) gmail (dot) com])
+AC_INIT([service-discovery-applet],[0.3],[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/src/service-discovery-applet.in b/src/service-discovery-applet.in
index 1784fe7..0d32084 100755
--- a/src/service-discovery-applet.in
+++ b/src/service-discovery-applet.in
@@ -97,18 +97,12 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
 	    for service_type, enabled in first_run_services.iteritems():
 		self.gc_client.set_bool("%s/%s" % (self.gc_services, service_type), enabled)
 
-
-	self.eb = gtk.EventBox()
-        self.eb.set_events(gtk.gdk.POINTER_MOTION_MASK)
-        self.eb.connect("button-press-event", self.on_button_press)
-
-	self.eb.connect("size-allocate", self.on_eventbox_size_allocate)
-
-        self.applet.add(self.eb)
+        applet.connect("button-press-event", self.on_button_press)
+	applet.connect("size-allocate", self.on_applet_size_allocate)
 
 	self.image = gtk.Image()
 	self.image.set_from_file("@iconsdir@/24x24/service-discovery-applet.png")
-	self.eb.add(self.image)
+	applet.add(self.image)
 	
 	applet.connect("change_background", self.on_change_background)
 	applet.set_applet_flags(gnomeapplet.EXPAND_MINOR)
@@ -116,10 +110,10 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
 	# funky right-click menu
 	menuXml = """
 	<popup name="button3">
-	<menuitem name="Service Discovery Applet About Item" verb="SDA About" _label="_About" pixtype="stock" pixname="gtk-about"/>
-	<menuitem name="Service Discovery Applet Configuration Item" verb="SDA Config" _label="_Config" pixtype="stock" pixname="gtk-preferences"/>
-	<menuitem name="Service Discovery Applet Start Item" verb="SDA Start" _label="_Start" pixtype="stock" pixname="gtk-media-play"/>
-	<menuitem name="Service Discovery Applet Stop Item" verb="SDA Stop" _label="_Stop" pixtype="stock" pixname="gtk-media-stop"/>
+	<menuitem name="SDA About Item" verb="SDA About" _label="_About" pixtype="stock" pixname="gtk-about"/>
+	<menuitem name="SDA Config Item" verb="SDA Config" _label="_Config" pixtype="stock" pixname="gtk-preferences"/>
+	<menuitem name="SDA Start Item" verb="SDA Start" _label="_Start" pixtype="stock" pixname="gtk-media-play"/>
+	<menuitem name="SDA Stop Item" verb="SDA Stop" _label="_Stop" pixtype="stock" pixname="gtk-media-stop"/>
 	</popup>
 	"""
 	
@@ -129,8 +123,7 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
 		("SDA Start", self.start_service_discovery),
 		("SDA Stop", self.stop_service_discovery)
 		], applet)
-	popup = applet.get_popup_component()
-	
+	self.popup = applet.get_popup_component()
     #Start Service Discovery
 	self.domain = ""
 	self.system_bus = dbus.SystemBus()
@@ -143,7 +136,8 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
         
 	self.start_service_discovery(None, None, None)
 	
-	self.applet.show_all()
+#	applet.connect("destroy",self.cleanup)
+#	applet.show_all()
 
     def start_notifying_cb(self):
         print "start notifying"
@@ -298,13 +292,16 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
             self.service_menu.show_all()
 	    self.service_menu.popup(None, None, self.position_popup_cb, event.button, event.time)
             self.applet.set_state(gtk.STATE_SELECTED)
-        return False 
+	if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3:
+#            widget.stop_emission("button-press-event")
+	    self.popup.popup(None, None, None, event.button, event.time)
+	return False
         
     def on_hide_service_menu(self,widget):
         self.applet.set_state(gtk.STATE_NORMAL)
         return False
 
-    def on_eventbox_size_allocate(self, eventbox, rect):
+    def on_applet_size_allocate(self, eventbox, rect):
         if (rect.x <= 0) or (rect.y <= 0):
             return False
         rect.x -= 1
@@ -315,10 +312,10 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
         return False
 
     def on_change_background(self, panelapplet, backgroundtype, color, pixmap):
-        self.eb.modify_bg(gtk.STATE_NORMAL, color)
+        panelapplet.modify_bg(gtk.STATE_NORMAL, color)
 
 	if backgroundtype == gnomeapplet.PIXMAP_BACKGROUND:
-            s = self.eb.get_style()
+            s = panelapplet.get_style()
 	    s.bg_pixmap[gtk.STATE_NORMAL] = pixmap
 
     def on_about(self, component, verb, applet):
@@ -400,9 +397,10 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet):
                 self.start_service_discovery(None,None,None)
 
 def applet_factory(applet, iid):
-    #service-discovery-applet = 
-    ServiceDiscoveryApplet(applet, iid)
-    #service-discovery-applet.show_all()
+    sda = ServiceDiscoveryApplet(applet, iid)
+    sda.applet.show_all()
+    print "applet_factory"
+    return True
 
 def activate_factory():
     gnomeapplet.bonobo_factory("OAFIID:GNOME_ServiceDiscoveryApplet_Factory",