libmm-glib,simple-connect-properties: move deprecated methods to compat source

4 files changed, 50 insertions, 56 deletions

diff --git a/libmm-glib/mm-compat.c b/libmm-glib/mm-compat.c
index 0a4dacbd..22c63d21 100644
--- a/libmm-glib/mm-compat.c
+++ b/libmm-glib/mm-compat.c
@@ -29,6 +29,22 @@
 /*****************************************************************************/
 
 void
+mm_simple_connect_properties_set_number (MMSimpleConnectProperties *self,
+                                         const gchar               *number)
+{
+    /* NO-OP */
+}
+
+const gchar *
+mm_simple_connect_properties_get_number (MMSimpleConnectProperties *self)
+{
+    /* NO-OP */
+    return NULL;
+}
+
+/*****************************************************************************/
+
+void
 mm_bearer_properties_set_number (MMBearerProperties *self,
                                  const gchar        *number)
 {
diff --git a/libmm-glib/mm-compat.h b/libmm-glib/mm-compat.h
index 1b984162..07a655ec 100644
--- a/libmm-glib/mm-compat.h
+++ b/libmm-glib/mm-compat.h
@@ -29,6 +29,7 @@
 #error "Only <libmm-glib.h> can be included directly."
 #endif
 
+#include "mm-simple-connect-properties.h"
 #include "mm-bearer-properties.h"
 #include "mm-call-properties.h"
 #include "mm-modem-oma.h"
@@ -45,6 +46,39 @@
 /*****************************************************************************/
 
 /**
+ * mm_simple_connect_properties_set_number:
+ * @self: a #MMSimpleConnectProperties.
+ * @number: the number.
+ *
+ * Sets the number to use when performing the connection.
+ *
+ * Since: 1.0
+ * Deprecated: 1.10.0. The number setting is not used anywhere, and therefore
+ * it doesn't make sense to expose it in the ModemManager interface.
+ */
+G_DEPRECATED
+void mm_simple_connect_properties_set_number (MMSimpleConnectProperties *self,
+                                              const gchar               *number);
+
+/**
+ * mm_simple_connect_properties_get_number:
+ * @self: a #MMSimpleConnectProperties.
+ *
+ * Gets the number to use when performing the connection.
+ *
+ * Returns: (transfer none): the number, or #NULL if not set. Do not free the
+ * returned value, it is owned by @self.
+ *
+ * Since: 1.0
+ * Deprecated: 1.10.0. The number setting is not used anywhere, and therefore
+ * it doesn't make sense to expose it in the ModemManager interface.
+ */
+G_DEPRECATED
+const gchar *mm_simple_connect_properties_get_number (MMSimpleConnectProperties *self);
+
+/*****************************************************************************/
+
+/**
  * mm_bearer_properties_set_number:
  * @self: a #MMBearerProperties.
  * @number: the number.
diff --git a/libmm-glib/mm-simple-connect-properties.c b/libmm-glib/mm-simple-connect-properties.c
index a70ce0d5..353a1257 100644
--- a/libmm-glib/mm-simple-connect-properties.c
+++ b/libmm-glib/mm-simple-connect-properties.c
@@ -519,54 +519,6 @@ mm_simple_connect_properties_get_multiplex (MMSimpleConnectProperties *self)
 
 /*****************************************************************************/
 
-#ifndef MM_DISABLE_DEPRECATED
-
-/**
- * mm_simple_connect_properties_set_number:
- * @self: a #MMSimpleConnectProperties.
- * @number: the number.
- *
- * Sets the number to use when performing the connection.
- *
- * Since: 1.0
- * Deprecated: 1.10.0. The number setting is not used anywhere, and therefore
- * it doesn't make sense to expose it in the ModemManager interface.
- */
-void
-mm_simple_connect_properties_set_number (MMSimpleConnectProperties *self,
-                                         const gchar *number)
-{
-    g_return_if_fail (MM_IS_SIMPLE_CONNECT_PROPERTIES (self));
-
-    /* NO-OP */
-}
-
-/**
- * mm_simple_connect_properties_get_number:
- * @self: a #MMSimpleConnectProperties.
- *
- * Gets the number to use when performing the connection.
- *
- * Returns: (transfer none): the number, or #NULL if not set. Do not free the
- * returned value, it is owned by @self.
- *
- * Since: 1.0
- * Deprecated: 1.10.0. The number setting is not used anywhere, and therefore
- * it doesn't make sense to expose it in the ModemManager interface.
- */
-const gchar *
-mm_simple_connect_properties_get_number (MMSimpleConnectProperties *self)
-{
-    g_return_val_if_fail (MM_IS_SIMPLE_CONNECT_PROPERTIES (self), NULL);
-
-    /* NO-OP */
-    return NULL;
-}
-
-#endif /* MM_DISABLE_DEPRECATED */
-
-/*****************************************************************************/
-
 /**
  * mm_simple_connect_properties_get_bearer_properties: (skip)
  */
diff --git a/libmm-glib/mm-simple-connect-properties.h b/libmm-glib/mm-simple-connect-properties.h
index 476677b8..353d3638 100644
--- a/libmm-glib/mm-simple-connect-properties.h
+++ b/libmm-glib/mm-simple-connect-properties.h
@@ -98,14 +98,6 @@ gboolean                  mm_simple_connect_properties_get_allow_roaming (MMSimp
 MMModemCdmaRmProtocol     mm_simple_connect_properties_get_rm_protocol   (MMSimpleConnectProperties *self);
 MMBearerMultiplexSupport  mm_simple_connect_properties_get_multiplex     (MMSimpleConnectProperties *self);
 
-#ifndef MM_DISABLE_DEPRECATED
-G_DEPRECATED
-void         mm_simple_connect_properties_set_number (MMSimpleConnectProperties *self,
-                                                      const gchar               *number);
-G_DEPRECATED
-const gchar *mm_simple_connect_properties_get_number (MMSimpleConnectProperties *self);
-#endif
-
 /*****************************************************************************/
 /* ModemManager/libmm-glib/mmcli specific methods */