Import Debian changes 1.12.2-0ubuntu3

network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium

  * debian/rules:
    - use --with-libnm-glib, the default reversed since that's a legacy
      library but we still need it for unity-control-center

network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium

  * debian/patches/git-newglib-test.patch:
    - backport upstream commit to fix the tests with the new glib 

network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium

  * New upstream version
  * d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
    d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
    d/p/git_thunderbolt_connect.patch:
    - removed, those changes are in the new version
  * Backport Debian changes
  * Update symbols file for libnm0
  * Enable iwd support
  * Drop version requirements when oldstable ships a newer version
  * Drop dh_strip override, the dbgsym migration is done
  * Rebase patches
  * Make sure the example server.conf is actually installed
  * Update install path for plugins, it now includes a version number
  * Drop libnl3 build dependency.
    Upstream has copied the code directly from libnl3 for the few functions it
    needs with a few small modifications.
  * Drop libiw build dependency.
    Hasn't been needed for a long time and was simply a left over from older
    releases.
  * Bump Standards-Version to 4.1.5
  * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)

1 files changed, 43 insertions, 9 deletions

diff --git a/libnm/nm-manager.h b/libnm/nm-manager.h
index 209a99a0..0a278aee 100644
--- a/libnm/nm-manager.h
+++ b/libnm/nm-manager.h
@@ -22,11 +22,13 @@
 #ifndef __NM_MANAGER_H__
 #define __NM_MANAGER_H__
 
+#if !((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_PRIVATE)
+#error Cannot use this header.
+#endif
+
 #include "nm-object.h"
 #include "nm-client.h"
 
-G_BEGIN_DECLS
-
 #define NM_TYPE_MANAGER            (nm_manager_get_type ())
 #define NM_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MANAGER, NMManager))
 #define NM_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_MANAGER, NMManagerClass))
@@ -51,6 +53,7 @@ G_BEGIN_DECLS
 #define NM_MANAGER_PRIMARY_CONNECTION "primary-connection"
 #define NM_MANAGER_ACTIVATING_CONNECTION "activating-connection"
 #define NM_MANAGER_DEVICES "devices"
+#define NM_MANAGER_CHECKPOINTS "checkpoints"
 #define NM_MANAGER_METERED "metered"
 #define NM_MANAGER_ALL_DEVICES "all-devices"
 
@@ -69,11 +72,11 @@ typedef struct {
 	void (*device_removed) (NMManager *manager, NMDevice *device);
 	void (*active_connection_added) (NMManager *manager, NMActiveConnection *ac);
 	void (*active_connection_removed) (NMManager *manager, NMActiveConnection *ac);
+	void (*checkpoint_added) (NMManager *manager, NMCheckpoint *checkpoint);
+	void (*checkpoint_removed) (NMManager *manager, NMCheckpoint *checkpoint);
 	void (*permission_changed) (NMManager *manager,
 	                            NMClientPermission permission,
 	                            NMClientPermissionResult result);
-
-	/* nm-manager.h is internal API. We can add more slots without breaking ABI. */
 } NMManagerClass;
 
 GType nm_manager_get_type (void);
@@ -99,13 +102,10 @@ gboolean  nm_manager_wimax_get_enabled (NMManager *manager);
 void      nm_manager_wimax_set_enabled (NMManager *manager, gboolean enabled);
 gboolean  nm_manager_wimax_hardware_get_enabled (NMManager *manager);
 
-NM_AVAILABLE_IN_1_10
 gboolean  nm_manager_connectivity_check_get_available (NMManager *manager);
 
-NM_AVAILABLE_IN_1_10
 gboolean  nm_manager_connectivity_check_get_enabled (NMManager *manager);
 
-NM_AVAILABLE_IN_1_10
 void      nm_manager_connectivity_check_set_enabled (NMManager *manager,
                                                      gboolean enabled);
 
@@ -137,7 +137,6 @@ NMConnectivityState nm_manager_check_connectivity_finish (NMManager *manager,
 /* Devices */
 
 const GPtrArray *nm_manager_get_devices    (NMManager *manager);
-NM_AVAILABLE_IN_1_2
 const GPtrArray *nm_manager_get_all_devices(NMManager *manager);
 NMDevice *nm_manager_get_device_by_path    (NMManager *manager, const char *object_path);
 NMDevice *nm_manager_get_device_by_iface   (NMManager *manager, const char *iface);
@@ -184,6 +183,41 @@ gboolean nm_manager_deactivate_connection_finish (NMManager *manager,
                                                   GAsyncResult *result,
                                                   GError **error);
 
-G_END_DECLS
+const GPtrArray *nm_manager_get_checkpoints (NMManager *manager);
+void nm_manager_checkpoint_create (NMManager *manager,
+                                   const GPtrArray *devices,
+                                   guint32 rollback_timeout,
+                                   NMCheckpointCreateFlags flags,
+                                   GCancellable *cancellable,
+                                   GAsyncReadyCallback callback,
+                                   gpointer user_data);
+NMCheckpoint *nm_manager_checkpoint_create_finish (NMManager *manager,
+                                                   GAsyncResult *result,
+                                                   GError **error);
+void nm_manager_checkpoint_destroy (NMManager *manager,
+                                    const char *checkpoint_path,
+                                    GCancellable *cancellable,
+                                    GAsyncReadyCallback callback,
+                                    gpointer user_data);
+gboolean nm_manager_checkpoint_destroy_finish (NMManager *manager,
+                                               GAsyncResult *result,
+                                               GError **error);
+void nm_manager_checkpoint_rollback (NMManager *manager,
+                                     const char *checkpoint_path,
+                                     GCancellable *cancellable,
+                                     GAsyncReadyCallback callback,
+                                     gpointer user_data);
+GHashTable *nm_manager_checkpoint_rollback_finish (NMManager *manager,
+                                                   GAsyncResult *result,
+                                                   GError **error);
+void nm_manager_checkpoint_adjust_rollback_timeout (NMManager *manager,
+                                                    const char *checkpoint_path,
+                                                    guint32 add_timeout,
+                                                    GCancellable *cancellable,
+                                                    GAsyncReadyCallback callback,
+                                                    gpointer user_data);
+gboolean nm_manager_checkpoint_adjust_rollback_timeout_finish (NMManager *manager,
+                                                               GAsyncResult *result,
+                                                               GError **error);
 
 #endif /* __NM_MANAGER_H__ */