diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-09-05 13:15:44 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-09-11 12:40:08 -0500 |
| commit | 56e2915536f6958f9103e080539240f9e258ea20 (patch) | |
| tree | 246a6aa078b46054f41401faeec4c7b34449d7c0 /src/nm-manager.h | |
| parent | 3382d3e1a2d5bf893ad5721eedad3a554e04f995 (diff) | |
| download | NetworkManager-56e2915536f6958f9103e080539240f9e258ea20.tar.gz | |
trivial: spacing and code cleanups in nm-manager.h
Remove some dead code and a redundant function.
Diffstat (limited to 'src/nm-manager.h')
| -rw-r--r-- | src/nm-manager.h | 57 |
1 files changed, 25 insertions, 32 deletions
diff --git a/src/nm-manager.h b/src/nm-manager.h index 2c6c9a04d3..55b0b3fc9f 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -92,45 +92,38 @@ 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, - gboolean initial_net_enabled, - gboolean initial_wifi_enabled, - gboolean initial_wwan_enabled, - gboolean initial_wimax_enabled, - GError **error); +NMManager * nm_manager_new (NMSettings *settings, + const char *state_file, + gboolean initial_net_enabled, + gboolean initial_wifi_enabled, + gboolean initial_wwan_enabled, + gboolean initial_wimax_enabled, + GError **error); -NMManager *nm_manager_get (void); +NMManager * nm_manager_get (void); -void nm_manager_start (NMManager *manager); - -const GSList *nm_manager_get_active_connections (NMManager *manager); -GSList *nm_manager_get_activatable_connections (NMManager *manager); +void nm_manager_start (NMManager *manager); +NMState nm_manager_get_state (NMManager *manager); +const GSList *nm_manager_get_active_connections (NMManager *manager); +GSList * nm_manager_get_activatable_connections (NMManager *manager); /* Device handling */ -const GSList *nm_manager_get_devices (NMManager *manager); - -NMDevice *nm_manager_get_device_by_master (NMManager *manager, - const char *master, - const char *driver); -NMDevice *nm_manager_get_device_by_ifindex (NMManager *manager, - int ifindex); - -NMActiveConnection *nm_manager_activate_connection (NMManager *manager, - NMConnection *connection, - const char *specific_object, - NMDevice *device, - NMAuthSubject *subject, - GError **error); +const GSList * nm_manager_get_devices (NMManager *manager); -gboolean nm_manager_deactivate_connection (NMManager *manager, - const char *connection_path, - NMDeviceStateReason reason, - GError **error); +NMDevice * nm_manager_get_device_by_ifindex (NMManager *manager, + int ifindex); -/* State handling */ +NMActiveConnection *nm_manager_activate_connection (NMManager *manager, + NMConnection *connection, + const char *specific_object, + NMDevice *device, + NMAuthSubject *subject, + GError **error); -NMState nm_manager_get_state (NMManager *manager); +gboolean nm_manager_deactivate_connection (NMManager *manager, + const char *connection_path, + NMDeviceStateReason reason, + GError **error); #endif /* __NETWORKMANAGER_MANAGER_H__ */ |