From f8e3b0626a98d971f121a37ed6bf48b227d8bb0a Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Fri, 20 Mar 2009 10:19:17 +0000
Subject: Fix nondeterministic denials for no-interface messages #575

Thanks to Dan Williams and Colin Walters for their assistance
in spotting this. upstream bug fdo #18961
---
(limited to 'src')

diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py
index e56c4d5..a87a1f2 100644
--- a/src/jarabe/desktop/meshbox.py
+++ b/src/jarabe/desktop/meshbox.py
@@ -101,15 +101,17 @@ class AccessPointView(CanvasPulsingIcon):
                                       dbus_interface=_NM_ACCESSPOINT_IFACE,
                                       byte_arrays=True)
 
-        self._device.Get(_NM_DEVICE_IFACE, 'State',
-                         reply_handler=self.__get_device_state_reply_cb,
-                         error_handler=self.__get_device_state_error_cb)
-        self._device.Get(_NM_WIRELESS_IFACE, 'WirelessCapabilities',
-                         reply_handler=self.__get_device_caps_reply_cb,
-                         error_handler=self.__get_device_caps_error_cb)
-        self._device.Get(_NM_WIRELESS_IFACE, 'ActiveAccessPoint',
-                         reply_handler=self.__get_active_ap_reply_cb,
-                         error_handler=self.__get_active_ap_error_cb)
+        interface_props = dbus.Interface(self._device,
+                                         'org.freedesktop.DBus.Properties')
+        interface_props.Get(_NM_DEVICE_IFACE, 'State',
+                            reply_handler=self.__get_device_state_reply_cb,
+                            error_handler=self.__get_device_state_error_cb)
+        interface_props.Get(_NM_WIRELESS_IFACE, 'WirelessCapabilities',
+                            reply_handler=self.__get_device_caps_reply_cb,
+                            error_handler=self.__get_device_caps_error_cb)
+        interface_props.Get(_NM_WIRELESS_IFACE, 'ActiveAccessPoint',
+                            reply_handler=self.__get_active_ap_reply_cb,
+                            error_handler=self.__get_active_ap_error_cb)
 
         self._bus.add_signal_receiver(self.__device_state_changed_cb,
                                       signal_name='StateChanged',
@@ -196,7 +198,7 @@ class AccessPointView(CanvasPulsingIcon):
         self._update()
 
     def __get_device_state_error_cb(self, err):
-        logging.debug('Error getting the access point properties: %s', err)
+        logging.debug('Error getting the device state: %s', err)
 
     def __get_all_props_reply_cb(self, properties):
         self._update_properties(properties)
--
cgit v0.9.1