summary refs log tree commit diff
path: root/libnm-glib/nm-remote-settings.h
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2012-03-24 01:37:02 +0100
committerMichael Biebl <biebl@debian.org>2012-03-24 01:37:02 +0100
commitde06e5715e780baade318f3490ac7a4c9ce84e32 (patch)
tree23fbc3fafc12072476eff98bee60100eb54c29db /libnm-glib/nm-remote-settings.h
parentb436a68a20ff3114ded32a7a3d70cdd4954039f9 (diff)
Imported Upstream version 0.9.4.0 upstream/0.9.4.0
Diffstat (limited to 'libnm-glib/nm-remote-settings.h')
-rw-r--r--libnm-glib/nm-remote-settings.h18
1 files changed, 11 insertions, 7 deletions
diff --git a/libnm-glib/nm-remote-settings.h b/libnm-glib/nm-remote-settings.h
index e882e4fa..dd6c5a34 100644
--- a/libnm-glib/nm-remote-settings.h
+++ b/libnm-glib/nm-remote-settings.h
@@ -24,7 +24,7 @@
 #ifndef NM_REMOTE_SETTINGS_H
 #define NM_REMOTE_SETTINGS_H
 
-#include <glib.h>
+#include <gio/gio.h>
 #include <dbus/dbus-glib.h>
 #include <nm-connection.h>
 #include <nm-remote-connection.h>
@@ -50,14 +50,11 @@ G_BEGIN_DECLS
  *
  **/
 typedef enum {
-	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,
-	NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED,
-	NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE,
+	NM_REMOTE_SETTINGS_ERROR_UNKNOWN = 0,            /*< nick=UnknownError >*/
+	NM_REMOTE_SETTINGS_ERROR_CONNECTION_REMOVED,     /*< nick=ConnectionRemoved >*/
+	NM_REMOTE_SETTINGS_ERROR_CONNECTION_UNAVAILABLE, /*< nick=ConnectionUnavailable >*/
 } NMRemoteSettingsError;
 
-#define NM_TYPE_REMOTE_SETTINGS_ERROR (nm_remote_settings_error_get_type ()) 
-GType nm_remote_settings_error_get_type (void);
-
 #define NM_REMOTE_SETTINGS_ERROR nm_remote_settings_error_quark ()
 GQuark nm_remote_settings_error_quark (void);
 
@@ -110,6 +107,13 @@ GType nm_remote_settings_get_type (void);
 
 NMRemoteSettings *nm_remote_settings_new (DBusGConnection *bus);
 
+void              nm_remote_settings_new_async  (DBusGConnection      *bus,
+                                                 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_path (NMRemoteSettings *settings,