diff options
| author | Michael Biebl <biebl@debian.org> | 2011-10-28 23:04:21 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-10-28 23:04:21 +0200 |
| commit | bc5840a47a748ffc2b6e7ec24c3dc5ba79664ca8 (patch) | |
| tree | bace204fa423c7489da190c08c2e86242c6b4588 /src/nm-manager.h | |
| parent | 0ed641587611afffa0b2cd38d5c70bdb480fa241 (diff) | |
| parent | 485d149fe80915d94ed49ea6c2c0552cf7a3e79a (diff) | |
Merge commit 'upstream/0.9.1.95'
Diffstat (limited to 'src/nm-manager.h')
| -rw-r--r-- | src/nm-manager.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nm-manager.h b/src/nm-manager.h index 22bfca9e..b044971f 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -67,9 +67,8 @@ typedef struct { GType nm_manager_get_type (void); -NMManager *nm_manager_get (NMSettings *settings, - const char *config_file, - const char *plugins, +/* nm_manager_new() should only be used by main.c */ +NMManager *nm_manager_new (NMSettings *settings, const char *state_file, gboolean initial_net_enabled, gboolean initial_wifi_enabled, @@ -77,6 +76,8 @@ NMManager *nm_manager_get (NMSettings *settings, gboolean initial_wimax_enabled, GError **error); +NMManager *nm_manager_get (void); + void nm_manager_start (NMManager *manager); /* Device handling */ |