diff options
| author | Dan Winship <danw@redhat.com> | 2015-08-03 09:26:31 -0400 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2015-08-10 09:41:26 -0400 |
| commit | 284e15a8775e487e094be7e327582d45a903af99 (patch) | |
| tree | 16fa1dc238a1df20188b96a0661072ba5d09b1f8 /src/nm-manager.h | |
| parent | b7911bae516a5b4cbacd20886e33b4a63597d1e4 (diff) | |
| download | NetworkManager-284e15a8775e487e094be7e327582d45a903af99.tar.gz | |
core: make NMManager singleton more like others
Rename nm_manager_new() to nm_manager_setup(), and change the local
@singleton variable to @singleton_instance. (Also, add a local @self
variable inside nm_manager_setup().)
Also, make NMManager own NMSettings rather than having them both owned
by main().
Diffstat (limited to 'src/nm-manager.h')
| -rw-r--r-- | src/nm-manager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/nm-manager.h b/src/nm-manager.h index 723f4822d0..f14e65ff3c 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -75,9 +75,8 @@ typedef struct { GType nm_manager_get_type (void); -/* nm_manager_new() should only be used by main.c */ -NMManager * nm_manager_new (NMSettings *settings, - const char *state_file, +/* nm_manager_setup() should only be used by main.c */ +NMManager * nm_manager_setup (const char *state_file, gboolean initial_net_enabled, gboolean initial_wifi_enabled, gboolean initial_wwan_enabled, @@ -85,7 +84,8 @@ NMManager * nm_manager_new (NMSettings *settings, NMManager * nm_manager_get (void); -void nm_manager_start (NMManager *manager); +gboolean nm_manager_start (NMManager *manager, + GError **error); void nm_manager_stop (NMManager *manager); NMState nm_manager_get_state (NMManager *manager); const GSList *nm_manager_get_active_connections (NMManager *manager); |