libmm-glib,modem: move deprecated methods to compat source

4 files changed, 39 insertions, 42 deletions

diff --git a/libmm-glib/mm-compat.c b/libmm-glib/mm-compat.c
index f2531a08..7a5ce216 100644
--- a/libmm-glib/mm-compat.c
+++ b/libmm-glib/mm-compat.c
@@ -172,4 +172,14 @@ mm_modem_peek_pending_network_initiated_sessions (MMModemOma
     return mm_modem_oma_peek_pending_network_initiated_sessions (self, sessions, n_sessions);
 }
 
+/*****************************************************************************/
+
+guint
+mm_modem_get_max_bearers (MMModem *self)
+{
+    g_return_val_if_fail (MM_IS_MODEM (self), 0);
+
+    return mm_gdbus_modem_get_max_bearers (MM_GDBUS_MODEM (self));
+}
+
 #endif /* MM_DISABLE_DEPRECATED */
diff --git a/libmm-glib/mm-compat.h b/libmm-glib/mm-compat.h
index 156883a7..e7b6e8bd 100644
--- a/libmm-glib/mm-compat.h
+++ b/libmm-glib/mm-compat.h
@@ -38,6 +38,7 @@
 #include "mm-simple-status.h"
 #include "mm-modem-3gpp.h"
 #include "mm-modem-oma.h"
+#include "mm-modem.h"
 
 /**
  * SECTION:mm-compat
@@ -351,6 +352,34 @@ gboolean mm_modem_peek_pending_network_initiated_sessions (MMModemOma
                                                            const MMOmaPendingNetworkInitiatedSession **sessions,
                                                            guint                                      *n_sessions);
 
+/*****************************************************************************/
+
+/**
+ * mm_modem_get_max_bearers:
+ * @self: a #MMModem.
+ *
+ * Gets the maximum number of defined packet data bearers this #MMModem
+ * supports.
+ *
+ * This is not the number of active/connected bearers the modem supports,
+ * but simply the number of bearers that may be defined at any given time.
+ * For example, POTS and CDMA2000-only devices support only one bearer,
+ * while GSM/UMTS devices typically support three or more, and any
+ * LTE-capable device (whether LTE-only, GSM/UMTS-capable, and/or
+ * CDMA2000-capable) also typically support three or more.
+ *
+ * Returns: the maximum number of defined packet data bearers.
+ *
+ * Since: 1.0
+ * Deprecated: 1.18. There is no way to query the modem how many bearers
+ * it supports, so the value exposed in this property in all the different
+ * implementations is always equal to the one retrieved with
+ * mm_modem_get_max_active_bearers(), so there is no point in using this
+ * method.
+ */
+G_DEPRECATED
+guint mm_modem_get_max_bearers (MMModem *self);
+
 #endif /* MM_DISABLE_DEPRECATED */
 
 #endif /* _MM_COMPAT_H_ */
diff --git a/libmm-glib/mm-modem.c b/libmm-glib/mm-modem.c
index 5ee3d86b..d117e856 100644
--- a/libmm-glib/mm-modem.c
+++ b/libmm-glib/mm-modem.c
@@ -397,43 +397,6 @@ mm_modem_get_current_capabilities (MMModem *self)
 
 /*****************************************************************************/
 
-#ifndef MM_DISABLE_DEPRECATED
-
-/**
- * mm_modem_get_max_bearers:
- * @self: a #MMModem.
- *
- * Gets the maximum number of defined packet data bearers this #MMModem
- * supports.
- *
- * This is not the number of active/connected bearers the modem supports,
- * but simply the number of bearers that may be defined at any given time.
- * For example, POTS and CDMA2000-only devices support only one bearer,
- * while GSM/UMTS devices typically support three or more, and any
- * LTE-capable device (whether LTE-only, GSM/UMTS-capable, and/or
- * CDMA2000-capable) also typically support three or more.
- *
- * Returns: the maximum number of defined packet data bearers.
- *
- * Since: 1.0
- * Deprecated: 1.18. There is no way to query the modem how many bearers
- * it supports, so the value exposed in this property in all the different
- * implementations is always equal to the one retrieved with
- * mm_modem_get_max_active_bearers(), so there is no point in using this
- * method.
- */
-guint
-mm_modem_get_max_bearers (MMModem *self)
-{
-    g_return_val_if_fail (MM_IS_MODEM (self), 0);
-
-    return mm_gdbus_modem_get_max_bearers (MM_GDBUS_MODEM (self));
-}
-
-#endif /* MM_DISABLE_DEPRECATED */
-
-/*****************************************************************************/
-
 /**
  * mm_modem_get_max_active_bearers:
  * @self: a #MMModem.
diff --git a/libmm-glib/mm-modem.h b/libmm-glib/mm-modem.h
index ee1f7879..37b6fd28 100644
--- a/libmm-glib/mm-modem.h
+++ b/libmm-glib/mm-modem.h
@@ -89,11 +89,6 @@ gboolean           mm_modem_get_supported_capabilities (MMModem *self,
 
 MMModemCapability  mm_modem_get_current_capabilities (MMModem *self);
 
-#ifndef MM_DISABLE_DEPRECATED
-G_DEPRECATED
-guint              mm_modem_get_max_bearers          (MMModem *self);
-#endif /* MM_DISABLE_DEPRECATED */
-
 guint              mm_modem_get_max_active_bearers             (MMModem *self);
 guint              mm_modem_get_max_active_multiplexed_bearers (MMModem *self);