2004-09-22 <clarkbw@cvs.gnome.org>
* initscript/Debian/.cvsignore: * initscript/Slackware/.cvsignore: Added new cvsignores for Makefile, Makefile.in * test/.cvsignore: Added nmtestdevices * src/NetworkManagerDevice.c: * src/NetworkManager.c: Updated the wireless/wired HAL device strings from net.ethernet to net.80203 or net.80211 depending on wired or wireless respectively Should probably update the configure.in to ask for the correct HAL version now. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@168 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -48,19 +48,34 @@ class NetworkManager:
|
||||
self.__devices = {}
|
||||
|
||||
def __init_dbus__(self):
|
||||
self._bus = dbus.SystemBus()
|
||||
self._nm_service = self._bus.get_service(NM_SERVICE)
|
||||
self.nm_object = self._nm_service.get_object(NM_PATH,
|
||||
NM_INTERFACE)
|
||||
|
||||
self._nmi_service = self._bus.get_service(NMI_SERVICE)
|
||||
self.nmi_object = self._nmi_service.get_object(NMI_PATH,
|
||||
NMI_INTERFACE)
|
||||
|
||||
self._hal_service = self._bus.get_service(HAL_SERVICE)
|
||||
self._hal_manager = self._hal_service.get_object(HAL_PATH,
|
||||
HAL_INTERFACE)
|
||||
try:
|
||||
self._bus = dbus.SystemBus()
|
||||
try:
|
||||
self._nm_service = self._bus.get_service(NM_SERVICE)
|
||||
self.nm_object = self._nm_service.get_object(NM_PATH,
|
||||
NM_INTERFACE)
|
||||
except Exception, e:
|
||||
print "Counldn't get the %s service" % NM_SERVICE
|
||||
print e
|
||||
|
||||
try:
|
||||
self._nmi_service = self._bus.get_service(NMI_SERVICE)
|
||||
self.nmi_object = self._nmi_service.get_object(NMI_PATH,
|
||||
NMI_INTERFACE)
|
||||
except Exception, e:
|
||||
print "Counldn't get the %s service" % NMI_SERVICE
|
||||
print e
|
||||
|
||||
try:
|
||||
self._hal_service = self._bus.get_service(HAL_SERVICE)
|
||||
self._hal_manager = self._hal_service.get_object(HAL_PATH,
|
||||
HAL_INTERFACE)
|
||||
except Exception, e:
|
||||
print "Counldn't get the %s service" % HAL_SERVICE
|
||||
print e
|
||||
|
||||
except Exception, e:
|
||||
print e
|
||||
|
||||
"""
|
||||
returns dictionary of the active device information
|
||||
|
Reference in New Issue
Block a user