diff options
| author | Dan Winship <danw@redhat.com> | 2015-07-31 12:33:07 -0400 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2015-08-10 09:41:25 -0400 |
| commit | 1c11c5cff15358026ea867a8127adb85173dfe5c (patch) | |
| tree | dfb4b917b66e2c566d3dd8a18566bbe4f2f5ece5 /src/nm-manager.h | |
| parent | c44069c10a4a9c696910baf0dbbefc41528f6dbe (diff) | |
| download | NetworkManager-1c11c5cff15358026ea867a8127adb85173dfe5c.tar.gz | |
core: fix NMManager in private-bus-only case
NMManager was failing to initialize if there was only a private bus,
despite the fact that this is exactly the use case that the private
bus was added for.
The only other potentially-failing code in nm_manager_new() was adding
prop_filter to the D-Bus connection, but this can't really fail, so
just assert that it doesn't. And now, nm_manager_new() always
succeeds, so update the caller for that.
Diffstat (limited to 'src/nm-manager.h')
| -rw-r--r-- | src/nm-manager.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nm-manager.h b/src/nm-manager.h index d8b566851d..723f4822d0 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -81,8 +81,7 @@ NMManager * nm_manager_new (NMSettings *settings, gboolean initial_net_enabled, gboolean initial_wifi_enabled, gboolean initial_wwan_enabled, - gboolean initial_wimax_enabled, - GError **error); + gboolean initial_wimax_enabled); NMManager * nm_manager_get (void); |