From 27a192c1ef063f7c29668cf61739335dc02ecf87 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Fri, 25 Jun 2021 11:28:55 +0200 Subject: [PATCH] libmm-glib,modem-3gpp: move deprecated methods to compat source --- .../libmm-glib/libmm-glib-sections.txt | 3 +- libmm-glib/mm-compat.c | 8 +++++ libmm-glib/mm-compat.h | 25 +++++++++++++++ libmm-glib/mm-modem-3gpp.c | 31 ------------------- libmm-glib/mm-modem-3gpp.h | 7 ----- 5 files changed, 35 insertions(+), 39 deletions(-) diff --git a/docs/reference/libmm-glib/libmm-glib-sections.txt b/docs/reference/libmm-glib/libmm-glib-sections.txt index 9bef8df6..a419be61 100644 --- a/docs/reference/libmm-glib/libmm-glib-sections.txt +++ b/docs/reference/libmm-glib/libmm-glib-sections.txt @@ -298,7 +298,6 @@ mm_modem_3gpp_get_operator_name mm_modem_3gpp_dup_operator_name mm_modem_3gpp_get_enabled_facility_locks mm_modem_3gpp_get_registration_state -mm_modem_3gpp_get_subscription_state mm_modem_3gpp_get_pco mm_modem_3gpp_get_eps_ue_mode_operation mm_modem_3gpp_get_initial_eps_bearer_path @@ -1835,6 +1834,8 @@ mm_call_properties_get_state_reason mm_call_properties_set_state_reason mm_location_gps_nmea_build_full + +mm_modem_3gpp_get_subscription_state mm_modem_peek_pending_network_initiated_sessions mm_modem_get_pending_network_initiated_sessions diff --git a/libmm-glib/mm-compat.c b/libmm-glib/mm-compat.c index 6d6c95d1..2c5f2d75 100644 --- a/libmm-glib/mm-compat.c +++ b/libmm-glib/mm-compat.c @@ -117,6 +117,14 @@ mm_location_gps_nmea_build_full (MMLocationGpsNmea *self) /*****************************************************************************/ +MMModem3gppSubscriptionState +mm_modem_3gpp_get_subscription_state (MMModem3gpp *self) +{ + return MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN; +} + +/*****************************************************************************/ + gboolean mm_modem_get_pending_network_initiated_sessions (MMModemOma *self, MMOmaPendingNetworkInitiatedSession **sessions, diff --git a/libmm-glib/mm-compat.h b/libmm-glib/mm-compat.h index 3d94e9a1..5a06da17 100644 --- a/libmm-glib/mm-compat.h +++ b/libmm-glib/mm-compat.h @@ -33,6 +33,7 @@ #include "mm-bearer-properties.h" #include "mm-call-properties.h" #include "mm-location-gps-nmea.h" +#include "mm-modem-3gpp.h" #include "mm-modem-oma.h" /** @@ -229,6 +230,30 @@ gchar *mm_location_gps_nmea_build_full (MMLocationGpsNmea *self); /*****************************************************************************/ +/** + * mm_modem_3gpp_get_subscription_state: + * @self: A #MMModem. + * + * Get the current subscription status of the account. This value is only + * available after the modem attempts to register with the network. + * + * The value of this property can only be obtained with operator specific logic + * (e.g. processing specific PCO info), and therefore it doesn't make sense to + * expose it in the ModemManager interface. + * + * Returns: A #MMModem3gppSubscriptionState value, specifying the current + * subscription state. + * + * Since: 1.0 + * Deprecated: 1.10.0. The value of this property can only be obtained with + * operator specific logic (e.g. processing specific PCO info), and therefore + * it doesn't make sense to expose it in the ModemManager interface. + */ +G_DEPRECATED +MMModem3gppSubscriptionState mm_modem_3gpp_get_subscription_state (MMModem3gpp *self); + +/*****************************************************************************/ + /** * mm_modem_get_pending_network_initiated_sessions: * @self: A #MMModem. diff --git a/libmm-glib/mm-modem-3gpp.c b/libmm-glib/mm-modem-3gpp.c index 630012ee..6fefc952 100644 --- a/libmm-glib/mm-modem-3gpp.c +++ b/libmm-glib/mm-modem-3gpp.c @@ -278,37 +278,6 @@ mm_modem_3gpp_get_registration_state (MMModem3gpp *self) /*****************************************************************************/ -#ifndef MM_DISABLE_DEPRECATED - -/** - * mm_modem_3gpp_get_subscription_state: - * @self: A #MMModem. - * - * Get the current subscription status of the account. This value is only - * available after the modem attempts to register with the network. - * - * The value of this property can only be obtained with operator specific logic - * (e.g. processing specific PCO info), and therefore it doesn't make sense to - * expose it in the ModemManager interface. - * - * Returns: A #MMModem3gppSubscriptionState value, specifying the current - * subscription state. - * - * Since: 1.0 - * Deprecated: 1.10.0. The value of this property can only be obtained with - * operator specific logic (e.g. processing specific PCO info), and therefore - * it doesn't make sense to expose it in the ModemManager interface. - */ -MMModem3gppSubscriptionState -mm_modem_3gpp_get_subscription_state (MMModem3gpp *self) -{ - return MM_MODEM_3GPP_SUBSCRIPTION_STATE_UNKNOWN; -} - -#endif /* MM_DISABLE_DEPRECATED */ - -/*****************************************************************************/ - /** * mm_modem_3gpp_get_enabled_facility_locks: * @self: A #MMModem3gpp. diff --git a/libmm-glib/mm-modem-3gpp.h b/libmm-glib/mm-modem-3gpp.h index 8de6c756..7baaf5a3 100644 --- a/libmm-glib/mm-modem-3gpp.h +++ b/libmm-glib/mm-modem-3gpp.h @@ -187,13 +187,6 @@ gboolean mm_modem_3gpp_disable_facility_lock_sync (MMModem3gpp *self, GCancellable *cancellable, GError **error); -#ifndef MM_DISABLE_DEPRECATED - -G_DEPRECATED -MMModem3gppSubscriptionState mm_modem_3gpp_get_subscription_state (MMModem3gpp *self); - -#endif - G_END_DECLS #endif /* _MM_MODEM_3GPP_H_ */