Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

This commit is contained in:
Dan Williams 2006-12-19 16:00:55 -05:00
commit baab27377f

View File

@ -727,12 +727,6 @@ class NMClientApp:
signal_name="NameOwnerChanged", signal_name="NameOwnerChanged",
dbus_interface="org.freedesktop.DBus") dbus_interface="org.freedesktop.DBus")
sys_bus.add_signal_receiver(self.catchall_signal_handler,
dbus_interface=NM_IFACE)
sys_bus.add_signal_receiver(self.catchall_signal_handler,
dbus_interface=NM_IFACE + 'Devices')
for (signal, handler) in self._sig_handlers.items(): for (signal, handler) in self._sig_handlers.items():
sys_bus.add_signal_receiver(handler, signal_name=signal, dbus_interface=NM_IFACE) sys_bus.add_signal_receiver(handler, signal_name=signal, dbus_interface=NM_IFACE)
@ -746,19 +740,6 @@ class NMClientApp:
except dbus.DBusException: except dbus.DBusException:
pass pass
@dbus.decorators.explicitly_pass_message
def catchall_signal_handler(self, *args, **keywords):
dbus_message = keywords['dbus_message']
mem = dbus_message.get_member()
iface = dbus_message.get_interface()
if iface == NM_IFACE and mem in self._sig_handlers.keys():
return
logging.debug('Caught signal %s.%s' % (dbus_message.get_interface(), mem))
for arg in args:
logging.debug(' ' + str(arg))
def _menu_item_clicked_cb(self, widget, event, dev_data): def _menu_item_clicked_cb(self, widget, event, dev_data):
(device, network) = dev_data (device, network) = dev_data
net_op = "" net_op = ""