diff options
| author | Michael Biebl <biebl@debian.org> | 2016-01-20 16:26:51 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-01-20 16:26:51 +0100 |
| commit | 494f296a3baab08522617b24b1f126d8f9a17502 (patch) | |
| tree | c8ef32fb0dd1c4ff35a0b38e787abb58692de0cd /src/nm-manager.h | |
| parent | 54f6333410ffd570e62717d9e77c5c987175e397 (diff) | |
Imported Upstream version 1.1.90 upstream/1.1.90
Diffstat (limited to 'src/nm-manager.h')
| -rw-r--r-- | src/nm-manager.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/nm-manager.h b/src/nm-manager.h index 711bcce8..2935d2a2 100644 --- a/src/nm-manager.h +++ b/src/nm-manager.h @@ -22,11 +22,8 @@ #ifndef __NETWORKMANAGER_MANAGER_H__ #define __NETWORKMANAGER_MANAGER_H__ -#include <glib.h> -#include <glib-object.h> - -#include "nm-types.h" -#include "nm-connection.h" +#include "nm-exported-object.h" +#include "nm-settings-connection.h" #define NM_TYPE_MANAGER (nm_manager_get_type ()) #define NM_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MANAGER, NMManager)) @@ -52,23 +49,27 @@ #define NM_MANAGER_ACTIVATING_CONNECTION "activating-connection" #define NM_MANAGER_DEVICES "devices" #define NM_MANAGER_METERED "metered" +#define NM_MANAGER_GLOBAL_DNS_CONFIGURATION "global-dns-configuration" +#define NM_MANAGER_ALL_DEVICES "all-devices" /* Not exported */ #define NM_MANAGER_HOSTNAME "hostname" #define NM_MANAGER_SLEEPING "sleeping" +#define NM_MANAGER_STATE_FILE "state-file" /* Internal signals */ #define NM_MANAGER_ACTIVE_CONNECTION_ADDED "active-connection-added" #define NM_MANAGER_ACTIVE_CONNECTION_REMOVED "active-connection-removed" #define NM_MANAGER_CONFIGURE_QUIT "configure-quit" +#define NM_MANAGER_STATE_CHANGED "state-changed" struct _NMManager { - GObject parent; + NMExportedObject parent; }; typedef struct { - GObjectClass parent; + NMExportedObjectClass parent; /* Signals */ void (*device_added) (NMManager *manager, NMDevice *device); @@ -78,17 +79,16 @@ 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, - gboolean initial_wimax_enabled); + gboolean initial_wwan_enabled); 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); @@ -102,7 +102,7 @@ NMDevice * nm_manager_get_device_by_ifindex (NMManager *manager, int ifindex); NMActiveConnection *nm_manager_activate_connection (NMManager *manager, - NMConnection *connection, + NMSettingsConnection *connection, const char *specific_object, NMDevice *device, NMAuthSubject *subject, |