diff --git a/wicd/configmanager.py b/wicd/configmanager.py index 8862bc8..c61faff 100644 --- a/wicd/configmanager.py +++ b/wicd/configmanager.py @@ -116,7 +116,7 @@ class ConfigManager(RawConfigParser): Int32(ret) except OverflowError: ret = long(ret) - return ret + return to_unicode(ret) def get(self, *args, **kargs): """ Calls the get_option method """ diff --git a/wicd/misc.py b/wicd/misc.py index bc5a2bd..64a877d 100644 --- a/wicd/misc.py +++ b/wicd/misc.py @@ -182,6 +182,8 @@ def WriteLine(my_file, text): def ExecuteScripts(scripts_dir, verbose=False): """ Execute every executable file in a given directory. """ + if not os.path.exists(scripts_dir): + return for obj in os.listdir(scripts_dir): obj = os.path.abspath(os.path.join(scripts_dir, obj)) if os.path.isfile(obj) and os.access(obj, os.X_OK): diff --git a/wicd/wicd-daemon.py b/wicd/wicd-daemon.py index 2274b57..ae38208 100644 --- a/wicd/wicd-daemon.py +++ b/wicd/wicd-daemon.py @@ -1055,14 +1055,14 @@ class WirelessDaemon(dbus.service.Object): return value @dbus.service.method('org.wicd.daemon.wireless') - def SetWirelessProperty(self, networkid, property, value): + def SetWirelessProperty(self, netid, prop, value): """ Sets property to value in network specified. """ # We don't write script settings here. - if (property.strip()).endswith("script"): + if (prop.strip()).endswith("script"): print "Setting script properties through the daemon is not" \ + " permitted." return False - self.LastScan[networkid][property] = misc.Noneify(value) + self.LastScan[netid][prop] = misc.to_unicode(misc.Noneify(value)) @dbus.service.method('org.wicd.daemon.wireless') def DetectWirelessInterface(self): @@ -1373,7 +1373,7 @@ class WiredDaemon(dbus.service.Object): print "Setting script properties through the daemon" \ + " is not permitted." return False - self.WiredNetwork[property] = misc.Noneify(value) + self.WiredNetwork[property] = misc.to_unicode(misc.Noneify(value)) return True else: print 'SetWiredProperty: WiredNetwork does not exist'