Attachment 57930 Details for Bug 46470 – [next, after merging] Remove all NUM_TP_…

[patch] [next, after merging] Remove all NUM_TP_…

0001-Remove-all-NUM_TP_.patch (text/plain), 7.31 KB, created by Simon McVittie on 2012-03-02 08:51:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-03-02 08:51:53 UTC

Size: 7.31 KB

patch

obsolete

>From 6ff18d7d5567465ff4e829c9d17bddf8a8259596 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 2 Mar 2012 16:48:53 +0000
>Subject: [PATCH] =?UTF-8?q?Remove=20all=20NUM=5FTP=5F=E2=80=A6?=
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46470
>---
> docs/reference/telepathy-glib-sections.txt |   46 ----------------------------
> telepathy-glib/contact.c                   |    9 -----
> telepathy-glib/contact.h                   |    1 -
> telepathy-glib/proxy.c                     |    9 -----
> telepathy-glib/proxy.h                     |    1 -
> 5 files changed, 0 insertions(+), 66 deletions(-)
>
>diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
>index 5ab2c4a..83e4a68 100644
>--- a/docs/reference/telepathy-glib-sections.txt
>+++ b/docs/reference/telepathy-glib-sections.txt
>@@ -1463,7 +1463,6 @@ TP_STRUCT_TYPE_SERVICE_POINT_INFO
> # Channel - Contact Search
> TpChannelContactSearchState
> TP_NUM_CHANNEL_CONTACT_SEARCH_STATES
>-NUM_TP_CHANNEL_CONTACT_SEARCH_STATES
> TP_HASH_TYPE_CONTACT_SEARCH_MAP
> TP_HASH_TYPE_CONTACT_SEARCH_RESULT_MAP
> <SUBSECTION>
>@@ -2220,146 +2219,103 @@ tp_cm_message_get_type
> <TITLE>enums</TITLE>
> TpHandleType
> TP_NUM_HANDLE_TYPES
>-NUM_TP_HANDLE_TYPES
> TpConnMgrParamFlags
> TpConnectionStatus
> TP_NUM_CONNECTION_STATUSES
>-NUM_TP_CONNECTION_STATUSES
> TpConnectionStatusReason
> TP_NUM_CONNECTION_STATUS_REASONS
>-NUM_TP_CONNECTION_STATUS_REASONS
> TpConnectionAliasFlags
> TpConnectionPresenceType
> TP_NUM_CONNECTION_PRESENCE_TYPES
>-NUM_TP_CONNECTION_PRESENCE_TYPES
> TpDTMFEvent
> TP_NUM_DTMF_EVENTS
>-NUM_TP_DTMF_EVENTS
> tp_dtmf_event_to_char
> TpChannelTextSendError
> TP_NUM_CHANNEL_TEXT_SEND_ERRORS
>-NUM_TP_CHANNEL_TEXT_SEND_ERRORS
> TpChannelTextMessageType
>-NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES
> TpChannelChatState
>-NUM_TP_CHANNEL_CHAT_STATES
> TP_NUM_CHANNEL_CHAT_STATES
> TpChannelGroupFlags
> TpChannelGroupChangeReason
>-NUM_TP_CHANNEL_GROUP_CHANGE_REASONS
> TP_NUM_CHANNEL_GROUP_CHANGE_REASONS
> TpChannelPasswordFlags
> TpContactBlockingCapabilities
> TpDeliveryReportingSupportFlags
> TpDeliveryStatus
>-NUM_TP_DELIVERY_STATUSES
> TpMessagePartSupportFlags
> TpMessageSendingFlags
>-NUM_TP_SOCKET_ACCESS_CONTROLS
> TP_NUM_SOCKET_ACCESS_CONTROLS
> TpSocketAccessControl
>-NUM_TP_SOCKET_ADDRESS_TYPES
> TP_NUM_SOCKET_ADDRESS_TYPES
> TpSocketAddressType
>-NUM_TP_LOCAL_HOLD_STATES
> TP_NUM_LOCAL_HOLD_STATES
> TpLocalHoldState
>-NUM_TP_LOCAL_HOLD_STATE_REASONS
> TP_NUM_LOCAL_HOLD_STATE_REASONS
> TpLocalHoldStateReason
> TpAccessControlType
>-NUM_TP_ACCESS_CONTROL_TYPES
> TP_NUM_ACCESS_CONTROL_TYPES
> TpRichPresenceAccessControlType
>-NUM_TP_RICH_PRESENCE_ACCESS_CONTROL_TYPES
> TP_NUM_RICH_PRESENCE_ACCESS_CONTROL_TYPES
> TpFileHashType
>-NUM_TP_FILE_HASH_TYPES
> TP_NUM_FILE_HASH_TYPES
> TpFileTransferState
>-NUM_TP_FILE_TRANSFER_STATES
> TP_NUM_FILE_TRANSFER_STATES
> TpFileTransferStateChangeReason
>-NUM_TP_FILE_TRANSFER_STATE_CHANGE_REASONS
> TP_NUM_FILE_TRANSFER_STATE_CHANGE_REASONS
> TpTubeChannelState
>-NUM_TP_TUBE_CHANNEL_STATES
> TP_NUM_TUBE_CHANNEL_STATES
> TpDebugLevel
>-NUM_TP_DEBUG_LEVELS
> TP_NUM_DEBUG_LEVELS
> TpContactInfoFlags
> TpContactInfoFieldFlags
> TpLocationFeatures
> TpServicePointType
>-NUM_TP_SERVICE_POINT_TYPES
> TP_NUM_SERVICE_POINT_TYPES
> TpAnonymityModeFlags
> TpStorageRestrictionFlags
> TpTLSCertificateRejectReason
>-NUM_TP_TLS_CERTIFICATE_REJECT_REASONS
> TP_NUM_TLS_CERTIFICATE_REJECT_REASONS
> TpTLSCertificateState
>-NUM_TP_TLS_CERTIFICATE_STATES
> TP_NUM_TLS_CERTIFICATE_STATES
> TpContactMetadataStorageType
>-NUM_TP_CONTACT_METADATA_STORAGE_TYPES
> TP_NUM_CONTACT_METADATA_STORAGE_TYPES
> TpSubscriptionState
>-NUM_TP_SUBSCRIPTION_STATES
> TP_NUM_SUBSCRIPTION_STATES
> TpContactListState
>-NUM_TP_CONTACT_LIST_STATES
> TP_NUM_CONTACT_LIST_STATES
> TpHTTPMethod
>-NUM_TP_HTTP_METHODS
> TP_NUM_HTTP_METHODS
> TpMailNotificationFlags
> TpSASLAbortReason
>-NUM_TP_SASL_ABORT_REASONS
> TP_NUM_SASL_ABORT_REASONS
> TpSASLStatus
>-NUM_TP_SASL_STATUSES
> TP_NUM_SASL_STATUSES
> TpCaptchaStatus
>-NUM_TP_CAPTCHA_STATUSES
> TP_NUM_CAPTCHA_STATUSES
> TpCaptchaCancelReason
>-NUM_TP_CAPTCHA_CANCEL_REASONS
> TP_NUM_CAPTCHA_CANCEL_REASONS
> TpCaptchaFlags
> TpCallContentDisposition
>-NUM_TP_CALL_CONTENT_DISPOSITIONS
> TP_NUM_CALL_CONTENT_DISPOSITIONS
> TpCallContentPacketizationType
>-NUM_TP_CALL_CONTENT_PACKETIZATION_TYPES
> TP_NUM_CALL_CONTENT_PACKETIZATION_TYPES
> TpCallState
>-NUM_TP_CALL_STATES
> TP_NUM_CALL_STATES
> TpCallStateChangeReason
>-NUM_TP_CALL_STATE_CHANGE_REASONS
> TP_NUM_CALL_STATE_CHANGE_REASONS
> TpCallStreamCandidateType
>-NUM_TP_CALL_STREAM_CANDIDATE_TYPES
> TP_NUM_CALL_STREAM_CANDIDATE_TYPES
> TpRCPTXRRTTMode
>-NUM_TP_RCPT_XR_RTT_MODES
> TP_NUM_RCPT_XR_RTT_MODES
> TpSendingState
>-NUM_TP_SENDING_STATES
> TP_NUM_SENDING_STATES
> TpStreamComponent
>-NUM_TP_STREAM_COMPONENTS
> TP_NUM_STREAM_COMPONENTS
> TpStreamEndpointState
>-NUM_TP_STREAM_ENDPOINT_STATES
> TP_NUM_STREAM_ENDPOINT_STATES
> TpStreamFlowState
>-NUM_TP_STREAM_FLOW_STATES
> TP_NUM_STREAM_FLOW_STATES
> TpStreamTransportType
>-NUM_TP_STREAM_TRANSPORT_TYPES
> TP_NUM_STREAM_TRANSPORT_TYPES
> TpCallFlags
> TpCallMemberFlags
>@@ -2987,7 +2943,6 @@ tp_proxy_get_invalidated
> tp_proxy_dbus_error_to_gerror
> TP_DBUS_ERRORS
> TpDBusError
>-NUM_TP_DBUS_ERRORS
> TP_NUM_DBUS_ERRORS
> TP_TYPE_DBUS_ERROR
> <SUBSECTION Standard>
>@@ -3807,7 +3762,6 @@ TpContactSearchResultPrivate
> TpContact
> TpContactFeature
> TP_CONTACT_FEATURE_INVALID
>-NUM_TP_CONTACT_FEATURES
> TP_NUM_CONTACT_FEATURES
> TP_TYPE_CONTACT_FEATURE
> TpConnectionContactsByHandleCb
>diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
>index b9b2380..f3a80bb 100644
>--- a/telepathy-glib/contact.c
>+++ b/telepathy-glib/contact.c
>@@ -133,15 +133,6 @@ struct _TpContact {
>  */
> 
> /**
>- * NUM_TP_CONTACT_FEATURES: (skip)
>- *
>- * 1 higher than the highest #TpContactFeature supported by this version of
>- * telepathy-glib. Use %TP_NUM_CONTACT_FEATURES in new code.
>- *
>- * Since: 0.7.18
>- */
>-
>-/**
>  * TP_CONTACT_FEATURE_INVALID: (skip)
>  *
>  * An invalid TpContactFeature. Used as list termination. See for example
>diff --git a/telepathy-glib/contact.h b/telepathy-glib/contact.h
>index 1a91a2d..35f8636 100644
>--- a/telepathy-glib/contact.h
>+++ b/telepathy-glib/contact.h
>@@ -68,7 +68,6 @@ typedef enum {
>     TP_CONTACT_FEATURE_CONTACT_BLOCKING,
> } TpContactFeature;
> #define TP_NUM_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_BLOCKING + 1)
>-#define NUM_TP_CONTACT_FEATURES TP_NUM_CONTACT_FEATURES
> #define TP_CONTACT_FEATURE_INVALID ((TpContactFeature) -1)
> 
> /* Basic functionality, always available */
>diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
>index 46ba2d1..106c3fa 100644
>--- a/telepathy-glib/proxy.c
>+++ b/telepathy-glib/proxy.c
>@@ -106,15 +106,6 @@ tp_dbus_errors_quark (void)
>  */
> 
> /**
>- * NUM_TP_DBUS_ERRORS: (skip)
>- *
>- * 1 more than the highest valid #TpDBusError at the time of compilation.
>- * In new code, use %TP_NUM_DBUS_ERRORS instead.
>- *
>- * Since: 0.7.1
>- */
>-
>-/**
>  * TP_NUM_DBUS_ERRORS:
>  *
>  * 1 more than the highest valid #TpDBusError at the time of compilation
>diff --git a/telepathy-glib/proxy.h b/telepathy-glib/proxy.h
>index ed47bdb..ad7c5cf 100644
>--- a/telepathy-glib/proxy.h
>+++ b/telepathy-glib/proxy.h
>@@ -56,7 +56,6 @@ typedef enum {
>     TP_DBUS_ERROR_INCONSISTENT = 10,
> } TpDBusError;
> #define TP_NUM_DBUS_ERRORS (TP_DBUS_ERROR_INCONSISTENT + 1)
>-#define NUM_TP_DBUS_ERRORS TP_NUM_DBUS_ERRORS
> 
> struct _TpProxy {
>     /*<private>*/
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 46470: 57472 | 57473 | 57928 | 57929 | 57930

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.