summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bluez-manager/nm-bluez-manager.c6
-rw-r--r--src/system-settings/nm-sysconfig-settings.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/bluez-manager/nm-bluez-manager.c b/src/bluez-manager/nm-bluez-manager.c
index fe027c4ff5..59849d3bd5 100644
--- a/src/bluez-manager/nm-bluez-manager.c
+++ b/src/bluez-manager/nm-bluez-manager.c
@@ -251,11 +251,13 @@ name_owner_changed_cb (NMDBusManager *dbus_mgr,
gboolean old_owner_good = (old_owner && strlen (old_owner));
gboolean new_owner_good = (new_owner && strlen (new_owner));
- /* Can't handle the signal if its not from the supplicant service */
+ /* Can't handle the signal if its not from the Bluez */
if (strcmp (BLUEZ_SERVICE, name))
return;
- if (old_owner_good && !new_owner_good)
+ if (!old_owner_good && new_owner_good)
+ query_default_adapter (self);
+ else if (old_owner_good && !new_owner_good)
remove_all_devices (self, TRUE);
}
diff --git a/src/system-settings/nm-sysconfig-settings.c b/src/system-settings/nm-sysconfig-settings.c
index a9bae14b1e..7f6a640e72 100644
--- a/src/system-settings/nm-sysconfig-settings.c
+++ b/src/system-settings/nm-sysconfig-settings.c
@@ -414,7 +414,7 @@ load_plugins (NMSysconfigSettings *self, const char *plugins, GError **error)
for (iter = plist; *iter; iter++) {
GModule *plugin;
char *full_name, *path;
- const char *pname = *iter;
+ const char *pname = g_strstrip (*iter);
GObject *obj;
GObject * (*factory_func) (void);