Merge tag 'upstream/1.8.0' into experimental

Upstream version 1.8.0

1 files changed, 6 insertions, 13 deletions

diff --git a/src/nm-connectivity.h b/src/nm-connectivity.h
index 6900bd0f..d9a9f233 100644
--- a/src/nm-connectivity.h
+++ b/src/nm-connectivity.h
@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Copyright (C) 2011 Thomas Bechtold <thomasbechtold@jpberlin.de>
+ * Copyright (C) 2017 Red Hat, Inc.
  */
 
 #ifndef __NETWORKMANAGER_CONNECTIVITY_H__
@@ -30,31 +31,23 @@
 #define NM_IS_CONNECTIVITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_CONNECTIVITY))
 #define NM_CONNECTIVITY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_CONNECTIVITY, NMConnectivityClass))
 
-#define NM_CONNECTIVITY_URI       "uri"
-#define NM_CONNECTIVITY_INTERVAL  "interval"
-#define NM_CONNECTIVITY_RESPONSE  "response"
-#define NM_CONNECTIVITY_STATE     "state"
+#define NM_CONNECTIVITY_PERIODIC_CHECK  "nm-connectivity-periodic-check"
 
 typedef struct _NMConnectivityClass NMConnectivityClass;
 
 GType nm_connectivity_get_type (void);
 
-const char *nm_connectivity_state_to_string (NMConnectivityState state);
-
-NMConnectivity      *nm_connectivity_new (const char *uri,
-                                          guint interval,
-                                          const char *response);
+NMConnectivity *nm_connectivity_get (void);
 
-void                 nm_connectivity_set_online   (NMConnectivity       *self,
-                                                   gboolean              online);
-
-NMConnectivityState  nm_connectivity_get_state    (NMConnectivity       *self);
+const char *nm_connectivity_state_to_string (NMConnectivityState state);
 
 void                 nm_connectivity_check_async  (NMConnectivity       *self,
+                                                   const char           *iface,
                                                    GAsyncReadyCallback   callback,
                                                    gpointer              user_data);
 NMConnectivityState  nm_connectivity_check_finish (NMConnectivity       *self,
                                                    GAsyncResult         *result,
                                                    GError              **error);
+gboolean nm_connectivity_check_enabled (NMConnectivity *self);
 
 #endif /* __NETWORKMANAGER_CONNECTIVITY_H__ */