diff options
| author | Dan Winship <danw@gnome.org> | 2014-09-29 10:58:16 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-10-10 12:40:19 -0400 |
| commit | 6f3d1f95262abbf5101d6f88ecfa292d575e0d4f (patch) | |
| tree | bffa6c50529d46377f71da8907dcd734a8e7a366 /libnm/nm-remote-settings.h | |
| parent | c1f1e9618126e618e9f10d9a5ce74b2ef7101e76 (diff) | |
| download | NetworkManager-6f3d1f95262abbf5101d6f88ecfa292d575e0d4f.tar.gz | |
libnm: merge NMRemoteSettings into NMClient
Make NMRemoteSettings internal and have NMClient wrap all of its APIs,
just like it does with NMManager.
Diffstat (limited to 'libnm/nm-remote-settings.h')
| -rw-r--r-- | libnm/nm-remote-settings.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/libnm/nm-remote-settings.h b/libnm/nm-remote-settings.h index 1ada9a21dd..bed6a495e4 100644 --- a/libnm/nm-remote-settings.h +++ b/libnm/nm-remote-settings.h @@ -22,10 +22,6 @@ #ifndef __NM_REMOTE_SETTINGS_H__ #define __NM_REMOTE_SETTINGS_H__ -#if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION) -#error "Only <NetworkManager.h> can be included directly." -#endif - #include <gio/gio.h> #include <nm-object.h> #include <nm-connection.h> @@ -40,30 +36,6 @@ G_BEGIN_DECLS #define NM_IS_REMOTE_SETTINGS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_REMOTE_SETTINGS)) #define NM_REMOTE_SETTINGS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_REMOTE_SETTINGS, NMRemoteSettingsClass)) -/** - * NMRemoteSettingsError: - * @NM_REMOTE_SETTINGS_ERROR_UNKNOWN: unknown or unclassified error - * @NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED: the #NMRemoteConnection object - * was removed before it was completely initialized - * @NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE: the #NMRemoteConnection object - * is not visible or otherwise unreadable - * @NM_REMOTE_SETTINGS_ERROR_SERVICE_UNAVAILABLE: NetworkManager is not running. - * - * Describes errors that may result from operations involving a #NMRemoteSettings. - * - **/ -typedef enum { - NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0, /*< nick=UnknownError >*/ - NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED, /*< nick=ConnectionRemoved >*/ - NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE, /*< nick=ConnectionUnavailable >*/ - NM_REMOTE_SETTINGS_ERROR_SERVICE_UNAVAILABLE, /*< nick=ServiceUnavailable >*/ -} NMRemoteSettingsError; - -#define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark () -GQuark nm_remote_settings_error_quark (void); - - -#define NM_REMOTE_SETTINGS_NM_RUNNING "nm-running" #define NM_REMOTE_SETTINGS_CONNECTIONS "connections" #define NM_REMOTE_SETTINGS_HOSTNAME "hostname" #define NM_REMOTE_SETTINGS_CAN_MODIFY "can-modify" @@ -93,15 +65,6 @@ struct _NMRemoteSettingsClass { GType nm_remote_settings_get_type (void); -NMRemoteSettings *nm_remote_settings_new (GCancellable *cancellable, - GError **error); - -void nm_remote_settings_new_async (GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -NMRemoteSettings *nm_remote_settings_new_finish (GAsyncResult *result, - GError **error); - GSList *nm_remote_settings_list_connections (NMRemoteSettings *settings); NMRemoteConnection *nm_remote_settings_get_connection_by_id (NMRemoteSettings *settings, |