diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-03-17 17:00:40 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-04-10 14:00:42 +0200 |
| commit | 16ef419d11efc6f2fd970622ca0a04224ddc51ce (patch) | |
| tree | c5300eafe9d24486f1866bbac40403bb83645199 | |
| parent | b31a6ccb1cc8289022888ba92746eef903d84c7c (diff) | |
libqmi-glib,wds: rename CM_CONFIGURATION_FAILED to CM_CONFERENCE_FAILED
And provide a compat symbol to keep API/ABI.
(cherry picked from commit b96ee9a3b42b890f47460778479a2b39cc02c261)
| -rw-r--r-- | docs/reference/libqmi-glib/libqmi-glib-common.sections | 2 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-compat.h | 14 | ||||
| -rw-r--r-- | src/libqmi-glib/qmi-enums-wds.h | 4 |
3 files changed, 18 insertions, 2 deletions
diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections index 5a8490c..d56e88e 100644 --- a/docs/reference/libqmi-glib/libqmi-glib-common.sections +++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections @@ -1494,8 +1494,10 @@ QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER QMI_PROTOCOL_ERROR_QOS_UNAVAILABLE +QMI_WDS_VERBOSE_CALL_END_REASON_CM_CONFIGURATION_FAILED <SUBSECTION Private> QmiDeprecatedNasSimRejectState QmiDeprecatedWdsCdmaCauseCode QmiDeprecatedProtocolError +QmiDeprecatedWdsVerboseCallEndReasonCm </SECTION> diff --git a/src/libqmi-glib/qmi-compat.h b/src/libqmi-glib/qmi-compat.h index f267199..b6868e6 100644 --- a/src/libqmi-glib/qmi-compat.h +++ b/src/libqmi-glib/qmi-compat.h @@ -1060,6 +1060,20 @@ typedef int QmiDeprecatedProtocolError; */ #define QMI_PROTOCOL_ERROR_QOS_UNAVAILABLE (QmiDeprecatedProtocolError) QMI_PROTOCOL_ERROR_REQUESTED_NUMBER_UNSUPPORTED +/* The following type exists just so that we can get deprecation warnings */ +G_DEPRECATED +typedef int QmiDeprecatedWdsVerboseCallEndReasonCm; + +/** + * QMI_WDS_VERBOSE_CALL_END_REASON_CM_CONFIGURATION_FAILED: + * + * Conference (not configuration) failed. + * + * Since: 1.0 + * Deprecated: 1.26.0: Use the correct #QMI_WDS_VERBOSE_CALL_END_REASON_CM_CONFERENCE_FAILED name instead. + */ +#define QMI_WDS_VERBOSE_CALL_END_REASON_CM_CONFIGURATION_FAILED (QmiDeprecatedWdsVerboseCallEndReasonCm) QMI_WDS_VERBOSE_CALL_END_REASON_CM_CONFERENCE_FAILED + /** * qmi_message_tlv_read_gfloat: * @self: a #QmiMessage. diff --git a/src/libqmi-glib/qmi-enums-wds.h b/src/libqmi-glib/qmi-enums-wds.h index 18704d0..0400d14 100644 --- a/src/libqmi-glib/qmi-enums-wds.h +++ b/src/libqmi-glib/qmi-enums-wds.h @@ -558,7 +558,7 @@ typedef enum { * @QMI_WDS_VERBOSE_CALL_END_REASON_CM_USER_CALL_ORIGINATED_DURING_SMS: (CDMA) Call originated during SMS. * @QMI_WDS_VERBOSE_CALL_END_REASON_CM_NO_CDMA_SERVICE: (CDMA) No service. * @QMI_WDS_VERBOSE_CALL_END_REASON_CM_RETRY_ORDER: Retry order. - * @QMI_WDS_VERBOSE_CALL_END_REASON_CM_CONFIGURATION_FAILED: Configuration failed. + * @QMI_WDS_VERBOSE_CALL_END_REASON_CM_CONFERENCE_FAILED: Conference failed. Since 1.26. * @QMI_WDS_VERBOSE_CALL_END_REASON_CM_INCOMING_REJECTED: Incoming rejected. * @QMI_WDS_VERBOSE_CALL_END_REASON_CM_NO_GATEWAY_SERVICE: No gateway service. * @QMI_WDS_VERBOSE_CALL_END_REASON_CM_NO_GPRS_CONTEXT: No GPRS context. @@ -616,7 +616,7 @@ typedef enum { QMI_WDS_VERBOSE_CALL_END_REASON_CM_NO_CDMA_SERVICE = 515, QMI_WDS_VERBOSE_CALL_END_REASON_CM_RETRY_ORDER = 519, - QMI_WDS_VERBOSE_CALL_END_REASON_CM_CONFIGURATION_FAILED = 1000, + QMI_WDS_VERBOSE_CALL_END_REASON_CM_CONFERENCE_FAILED = 1000, QMI_WDS_VERBOSE_CALL_END_REASON_CM_INCOMING_REJECTED = 1001, QMI_WDS_VERBOSE_CALL_END_REASON_CM_NO_GATEWAY_SERVICE = 1002, QMI_WDS_VERBOSE_CALL_END_REASON_CM_NO_GPRS_CONTEXT = 1003, |