diff options
| author | Sebastien Estienne <sebastien.estienne@gmail.com> | 2005-10-06 13:15:41 +0000 |
|---|---|---|
| committer | Sebastien Estienne <sebastien.estienne@gmail.com> | 2005-10-06 13:15:41 +0000 |
| commit | aeb1d09124bd57ecf78e138c4466d682827eb354 (patch) | |
| tree | 07598bd1ad35a53dd371639ee71a76025dfd196f | |
| parent | c3d1c02a6e32d3612490816a50552e8f6d8de2e5 (diff) | |
* more cleaning
git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@44 3be567f1-68ff-0310-b24a-ad7cc433fd2f
| -rwxr-xr-x | src/service-discovery-applet.in | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/service-discovery-applet.in b/src/service-discovery-applet.in index 0d32084..7e3e937 100755 --- a/src/service-discovery-applet.in +++ b/src/service-discovery-applet.in @@ -100,9 +100,9 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): 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") - applet.add(self.image) + image = gtk.Image() + image.set_from_file("@iconsdir@/24x24/service-discovery-applet.png") + applet.add(image) applet.connect("change_background", self.on_change_background) applet.set_applet_flags(gnomeapplet.EXPAND_MINOR) @@ -124,6 +124,7 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): ("SDA Stop", self.stop_service_discovery) ], applet) self.popup = applet.get_popup_component() + self.popup_control = applet.get_control() #Start Service Discovery self.domain = "" self.system_bus = dbus.SystemBus() @@ -291,10 +292,9 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): if event.type == gtk.gdk.BUTTON_PRESS and event.button == 1: 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) - 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) + widget.set_state(gtk.STATE_SELECTED) +# if event.type == gtk.gdk.BUTTON_PRESS and event.button == 3: +# self.popup_control.do_popup(event.button,event.time) return False def on_hide_service_menu(self,widget): @@ -313,7 +313,6 @@ class ServiceDiscoveryApplet(gnomeapplet.Applet): def on_change_background(self, panelapplet, backgroundtype, color, pixmap): panelapplet.modify_bg(gtk.STATE_NORMAL, color) - if backgroundtype == gnomeapplet.PIXMAP_BACKGROUND: s = panelapplet.get_style() s.bg_pixmap[gtk.STATE_NORMAL] = pixmap |