[network-manager-applet/lr/pkcs11] fixup! libnma: add and use version macros

[Thomas Haller <thaller src gnome org>]

commit e44a58c6ef15525f0a45499a54d749a0d542dbd9
Author: Thomas Haller <thaller redhat com>
Date:   Mon Mar 6 18:59:19 2017 +0100

    fixup! libnma: add and use version macros

 src/libnma/nma-version.h.in  |   21 ++++++++-------------
 src/libnma/nma-wifi-dialog.h |    8 ++++----
 2 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/src/libnma/nma-version.h.in b/src/libnma/nma-version.h.in
index 4c8b9cc..bcdb5bd 100644
--- a/src/libnma/nma-version.h.in
+++ b/src/libnma/nma-version.h.in
@@ -63,6 +63,7 @@
 
 #define NMA_ENCODE_VERSION(major,minor,micro) ((major) << 16 | (minor) << 8 | (micro))
 
+#define NMA_VERSION_1_2    (NMA_ENCODE_VERSION (1, 2, 0))
 #define NMA_VERSION_1_4    (NMA_ENCODE_VERSION (1, 4, 0))
 #define NMA_VERSION_1_8    (NMA_ENCODE_VERSION (1, 8, 0))
 
@@ -90,22 +91,16 @@
 #if NMA_VERSION_MAX_ALLOWED < NMA_VERSION_MIN_REQUIRED
 #error "NMA_VERSION_MAX_ALLOWED must be >= NMA_VERSION_MIN_REQUIRED"
 #endif
-#if NMA_VERSION_MIN_REQUIRED < NMA_VERSION_1_4
-#error "NMA_VERSION_MIN_REQUIRED must be >= NMA_VERSION_1_4"
+#if NMA_VERSION_MIN_REQUIRED < NMA_VERSION_1_2
+#error "NMA_VERSION_MIN_REQUIRED must be >= NMA_VERSION_1_2"
 #endif
 
-#if NMA_VERSION_MIN_REQUIRED >= NMA_VERSION_1_4
-# define NMA_DEPRECATED_IN_1_4           G_DEPRECATED
-# define NMA_DEPRECATED_IN_1_4_FOR(f)    G_DEPRECATED_FOR(f)
+#if NMA_VERSION_MIN_REQUIRED >= NMA_VERSION_1_2
+# define NMA_DEPRECATED_IN_1_2           G_DEPRECATED
+# define NMA_DEPRECATED_IN_1_2_FOR(f)    G_DEPRECATED_FOR(f)
 #else
-# define NMA_DEPRECATED_IN_1_4
-# define NMA_DEPRECATED_IN_1_4_FOR(f)
-#endif
-
-#if NMA_VERSION_MAX_ALLOWED < NMA_VERSION_1_4
-# define NMA_AVAILABLE_IN_1_4            G_UNAVAILABLE(1,4)
-#else
-# define NMA_AVAILABLE_IN_1_4
+# define NMA_DEPRECATED_IN_1_2
+# define NMA_DEPRECATED_IN_1_2_FOR(f)
 #endif
 
 #if NMA_VERSION_MIN_REQUIRED >= NMA_VERSION_1_8
diff --git a/src/libnma/nma-wifi-dialog.h b/src/libnma/nma-wifi-dialog.h
index 3868a06..bb7a8c1 100644
--- a/src/libnma/nma-wifi-dialog.h
+++ b/src/libnma/nma-wifi-dialog.h
@@ -61,16 +61,16 @@ NMConnection * nma_wifi_dialog_get_connection (NMAWifiDialog *self,
                                                NMDevice **device,
                                                NMAccessPoint **ap);
 
-NMA_DEPRECATED_IN_1_4
+NMA_DEPRECATED_IN_1_2
 GtkWidget * nma_wifi_dialog_nag_user (NMAWifiDialog *self);
 
-NMA_DEPRECATED_IN_1_4
+NMA_DEPRECATED_IN_1_2
 void nma_wifi_dialog_set_nag_ignored (NMAWifiDialog *self, gboolean ignored);
 
-NMA_DEPRECATED_IN_1_4
+NMA_DEPRECATED_IN_1_2
 gboolean nma_wifi_dialog_get_nag_ignored (NMAWifiDialog *self);
 
-NMA_DEPRECATED_IN_1_4_FOR(nma_wifi_dialog_new_for_hidden)
+NMA_DEPRECATED_IN_1_2_FOR(nma_wifi_dialog_new_for_hidden)
 GtkWidget *nma_wifi_dialog_new_for_other (NMClient *client);
 
 #endif /* NMA_WIFI_DIALOG_H */