| account-manager.h | | account-manager.h | |
| | | | |
| skipping to change at line 124 | | skipping to change at line 124 | |
| | | | |
| void tp_account_manager_create_account_async (TpAccountManager *manager, | | void tp_account_manager_create_account_async (TpAccountManager *manager, | |
| const gchar *connection_manager, const gchar *protocol, | | const gchar *connection_manager, const gchar *protocol, | |
| const gchar *display_name, GHashTable *parameters, GHashTable *properti
es, | | const gchar *display_name, GHashTable *parameters, GHashTable *properti
es, | |
| GAsyncReadyCallback callback, gpointer user_data); | | GAsyncReadyCallback callback, gpointer user_data); | |
| | | | |
| TpAccount * tp_account_manager_create_account_finish ( | | TpAccount * tp_account_manager_create_account_finish ( | |
| TpAccountManager *manager, GAsyncResult *result, GError **error) | | TpAccountManager *manager, GAsyncResult *result, GError **error) | |
| G_GNUC_WARN_UNUSED_RESULT; | | G_GNUC_WARN_UNUSED_RESULT; | |
| | | | |
|
| | | #ifndef TP_DISABLE_DEPRECATED | |
| | | _TP_DEPRECATED_IN_0_24_FOR(tp_proxy_is_prepared) | |
| gboolean tp_account_manager_is_prepared (TpAccountManager *manager, | | gboolean tp_account_manager_is_prepared (TpAccountManager *manager, | |
| GQuark feature); | | GQuark feature); | |
| | | | |
|
| #ifndef TP_DISABLE_DEPRECATED | | | |
| _TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_async) | | _TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_async) | |
| void tp_account_manager_prepare_async (TpAccountManager *manager, | | void tp_account_manager_prepare_async (TpAccountManager *manager, | |
| const GQuark *features, | | const GQuark *features, | |
| GAsyncReadyCallback callback, | | GAsyncReadyCallback callback, | |
| gpointer user_data); | | gpointer user_data); | |
| | | | |
| _TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_finish) | | _TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_finish) | |
| gboolean tp_account_manager_prepare_finish (TpAccountManager *manager, | | gboolean tp_account_manager_prepare_finish (TpAccountManager *manager, | |
| GAsyncResult *result, | | GAsyncResult *result, | |
| GError **error); | | GError **error); | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 2 lines changed or added | |
|
| account.h | | account.h | |
| | | | |
| skipping to change at line 253 | | skipping to change at line 253 | |
| const gchar * const * | | const gchar * const * | |
| /* ugh, gtk-doc */ | | /* ugh, gtk-doc */ | |
| tp_account_get_supersedes (TpAccount *self); | | tp_account_get_supersedes (TpAccount *self); | |
| | | | |
| void tp_account_get_avatar_async (TpAccount *account, | | void tp_account_get_avatar_async (TpAccount *account, | |
| GAsyncReadyCallback callback, gpointer user_data); | | GAsyncReadyCallback callback, gpointer user_data); | |
| | | | |
| const GArray *tp_account_get_avatar_finish (TpAccount *account, | | const GArray *tp_account_get_avatar_finish (TpAccount *account, | |
| GAsyncResult *result, GError **error); | | GAsyncResult *result, GError **error); | |
| | | | |
|
| | | #ifndef TP_DISABLE_DEPRECATED | |
| | | _TP_DEPRECATED_IN_0_24_FOR(tp_proxy_is_prepared) | |
| gboolean tp_account_is_prepared (TpAccount *account, GQuark feature); | | gboolean tp_account_is_prepared (TpAccount *account, GQuark feature); | |
|
| | | #endif | |
| | | | |
| #ifndef TP_DISABLE_DEPRECATED | | #ifndef TP_DISABLE_DEPRECATED | |
| _TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_async) | | _TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_async) | |
| void tp_account_prepare_async (TpAccount *account, | | void tp_account_prepare_async (TpAccount *account, | |
| const GQuark *features, | | const GQuark *features, | |
| GAsyncReadyCallback callback, | | GAsyncReadyCallback callback, | |
| gpointer user_data); | | gpointer user_data); | |
| | | | |
| _TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_finish) | | _TP_DEPRECATED_IN_0_16_FOR (tp_proxy_prepare_finish) | |
| gboolean tp_account_prepare_finish (TpAccount *account, | | gboolean tp_account_prepare_finish (TpAccount *account, | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 3 lines changed or added | |
|
| defs.h | | defs.h | |
| | | | |
| skipping to change at line 163 | | skipping to change at line 163 | |
| * Since: 0.11.13 | | * Since: 0.11.13 | |
| */ | | */ | |
| #define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64) | | #define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64) | |
| | | | |
| #define _TP_ENCODE_VERSION(major, minor) (((major) << 16) | ((minor) << 8)) | | #define _TP_ENCODE_VERSION(major, minor) (((major) << 16) | ((minor) << 8)) | |
| | | | |
| #define TP_VERSION_0_16 (_TP_ENCODE_VERSION (0, 16)) | | #define TP_VERSION_0_16 (_TP_ENCODE_VERSION (0, 16)) | |
| #define TP_VERSION_0_18 (_TP_ENCODE_VERSION (0, 18)) | | #define TP_VERSION_0_18 (_TP_ENCODE_VERSION (0, 18)) | |
| #define TP_VERSION_0_20 (_TP_ENCODE_VERSION (0, 20)) | | #define TP_VERSION_0_20 (_TP_ENCODE_VERSION (0, 20)) | |
| #define TP_VERSION_0_22 (_TP_ENCODE_VERSION (0, 22)) | | #define TP_VERSION_0_22 (_TP_ENCODE_VERSION (0, 22)) | |
|
| | | #define TP_VERSION_0_24 (_TP_ENCODE_VERSION (0, 24)) | |
| #define TP_VERSION_1_0 (_TP_ENCODE_VERSION (1, 0)) | | #define TP_VERSION_1_0 (_TP_ENCODE_VERSION (1, 0)) | |
| | | | |
| #if (TP_MINOR_VERSION == 99) | | #if (TP_MINOR_VERSION == 99) | |
| /* special case for telepathy-glib 1.0 prereleases */ | | /* special case for telepathy-glib 1.0 prereleases */ | |
| # define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION + 1,
0)) | | # define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION + 1,
0)) | |
| #elif (TP_MINOR_VERSION == 0) | | #elif (TP_MINOR_VERSION == 0) | |
| /* special case for telepathy-glib 1.0 itself */ | | /* special case for telepathy-glib 1.0 itself */ | |
| # define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, 0)) | | # define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, 0)) | |
| #elif (TP_MICRO_VERSION >= 99 && (TP_MINOR_VERSION % 2) == 0) | | #elif (TP_MICRO_VERSION >= 99 && (TP_MINOR_VERSION % 2) == 0) | |
| /* development branch about to start (0.18.999.1) */ | | /* development branch about to start (0.18.999.1) */ | |
| | | | |
| skipping to change at line 232 | | skipping to change at line 233 | |
| #endif | | #endif | |
| | | | |
| #if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_22 | | #if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_22 | |
| # define _TP_DEPRECATED_IN_0_22 _TP_DEPRECATED | | # define _TP_DEPRECATED_IN_0_22 _TP_DEPRECATED | |
| # define _TP_DEPRECATED_IN_0_22_FOR(f) _TP_DEPRECATED_FOR(f) | | # define _TP_DEPRECATED_IN_0_22_FOR(f) _TP_DEPRECATED_FOR(f) | |
| #else | | #else | |
| # define _TP_DEPRECATED_IN_0_22 /* nothing */ | | # define _TP_DEPRECATED_IN_0_22 /* nothing */ | |
| # define _TP_DEPRECATED_IN_0_22_FOR(f) /* nothing */ | | # define _TP_DEPRECATED_IN_0_22_FOR(f) /* nothing */ | |
| #endif | | #endif | |
| | | | |
|
| | | #if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_24 | |
| | | # define _TP_DEPRECATED_IN_0_24 _TP_DEPRECATED | |
| | | # define _TP_DEPRECATED_IN_0_24_FOR(f) _TP_DEPRECATED_FOR(f) | |
| | | #else | |
| | | # define _TP_DEPRECATED_IN_0_24 /* nothing */ | |
| | | # define _TP_DEPRECATED_IN_0_24_FOR(f) /* nothing */ | |
| | | #endif | |
| | | | |
| #if TP_VERSION_MIN_REQUIRED >= TP_VERSION_1_0 | | #if TP_VERSION_MIN_REQUIRED >= TP_VERSION_1_0 | |
| # define _TP_DEPRECATED_IN_1_0 _TP_DEPRECATED | | # define _TP_DEPRECATED_IN_1_0 _TP_DEPRECATED | |
| # define _TP_DEPRECATED_IN_1_0_FOR(f) _TP_DEPRECATED_FOR(f) | | # define _TP_DEPRECATED_IN_1_0_FOR(f) _TP_DEPRECATED_FOR(f) | |
| #else | | #else | |
| # define _TP_DEPRECATED_IN_1_0 /* nothing */ | | # define _TP_DEPRECATED_IN_1_0 /* nothing */ | |
| # define _TP_DEPRECATED_IN_1_0_FOR(f) /* nothing */ | | # define _TP_DEPRECATED_IN_1_0_FOR(f) /* nothing */ | |
| #endif | | #endif | |
| | | | |
| #if TP_VERSION_MIN_REQUIRED >= _TP_VERSION_CUR_STABLE | | #if TP_VERSION_MIN_REQUIRED >= _TP_VERSION_CUR_STABLE | |
| # define _TP_DEPRECATED_IN_UNRELEASED _TP_DEPRECATED | | # define _TP_DEPRECATED_IN_UNRELEASED _TP_DEPRECATED | |
| | | | |
| skipping to change at line 272 | | skipping to change at line 281 | |
| #else | | #else | |
| # define _TP_AVAILABLE_IN_0_20 /* nothing */ | | # define _TP_AVAILABLE_IN_0_20 /* nothing */ | |
| #endif | | #endif | |
| | | | |
| #if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_22 | | #if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_22 | |
| # define _TP_AVAILABLE_IN_0_22 _TP_UNAVAILABLE(0, 22) | | # define _TP_AVAILABLE_IN_0_22 _TP_UNAVAILABLE(0, 22) | |
| #else | | #else | |
| # define _TP_AVAILABLE_IN_0_22 /* nothing */ | | # define _TP_AVAILABLE_IN_0_22 /* nothing */ | |
| #endif | | #endif | |
| | | | |
|
| | | #if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_24 | |
| | | # define _TP_AVAILABLE_IN_0_24 _TP_UNAVAILABLE(0, 24) | |
| | | #else | |
| | | # define _TP_AVAILABLE_IN_0_24 /* nothing */ | |
| | | #endif | |
| | | | |
| #if TP_VERSION_MAX_ALLOWED < TP_VERSION_1_0 | | #if TP_VERSION_MAX_ALLOWED < TP_VERSION_1_0 | |
| # define _TP_AVAILABLE_IN_1_0 _TP_UNAVAILABLE(1, 0) | | # define _TP_AVAILABLE_IN_1_0 _TP_UNAVAILABLE(1, 0) | |
| #else | | #else | |
| # define _TP_AVAILABLE_IN_1_0 /* nothing */ | | # define _TP_AVAILABLE_IN_1_0 /* nothing */ | |
| #endif | | #endif | |
| | | | |
| #if TP_VERSION_MAX_ALLOWED < _TP_VERSION_CUR_STABLE | | #if TP_VERSION_MAX_ALLOWED < _TP_VERSION_CUR_STABLE | |
| # define _TP_AVAILABLE_IN_UNRELEASED \ | | # define _TP_AVAILABLE_IN_UNRELEASED \ | |
| _TP_UNAVAILABLE (TP_MAJOR_VERSION, TP_MINOR_VERSION) | | _TP_UNAVAILABLE (TP_MAJOR_VERSION, TP_MINOR_VERSION) | |
| #else | | #else | |
| | | | |
End of changes. 3 change blocks. |
| 0 lines changed or deleted | | 15 lines changed or added | |
|
| telepathy-glib.h | | telepathy-glib.h | |
| | | | |
| skipping to change at line 113 | | skipping to change at line 113 | |
| #include <telepathy-glib/run.h> | | #include <telepathy-glib/run.h> | |
| #include <telepathy-glib/signalled-message.h> | | #include <telepathy-glib/signalled-message.h> | |
| #include <telepathy-glib/simple-approver.h> | | #include <telepathy-glib/simple-approver.h> | |
| #include <telepathy-glib/simple-client-factory.h> | | #include <telepathy-glib/simple-client-factory.h> | |
| #include <telepathy-glib/simple-handler.h> | | #include <telepathy-glib/simple-handler.h> | |
| #include <telepathy-glib/simple-password-manager.h> | | #include <telepathy-glib/simple-password-manager.h> | |
| #include <telepathy-glib/simple-observer.h> | | #include <telepathy-glib/simple-observer.h> | |
| #include <telepathy-glib/stream-tube-channel.h> | | #include <telepathy-glib/stream-tube-channel.h> | |
| #include <telepathy-glib/stream-tube-connection.h> | | #include <telepathy-glib/stream-tube-connection.h> | |
| #include <telepathy-glib/text-channel.h> | | #include <telepathy-glib/text-channel.h> | |
|
| | | #include <telepathy-glib/text-mixin.h> | |
| #include <telepathy-glib/tls-certificate.h> | | #include <telepathy-glib/tls-certificate.h> | |
| #include <telepathy-glib/variant-util.h> | | #include <telepathy-glib/variant-util.h> | |
| | | | |
| /* deprecated, gone in 1.0 */ | | /* deprecated, gone in 1.0 */ | |
| #include <telepathy-glib/automatic-proxy-factory.h> | | #include <telepathy-glib/automatic-proxy-factory.h> | |
| #include <telepathy-glib/basic-proxy-factory.h> | | #include <telepathy-glib/basic-proxy-factory.h> | |
| #include <telepathy-glib/channel-iface.h> | | #include <telepathy-glib/channel-iface.h> | |
| #include <telepathy-glib/client-channel-factory.h> | | #include <telepathy-glib/client-channel-factory.h> | |
| | | | |
| /* D-Bus-API-dependent, moved to telepathy-glib-dbus.h in 1.0 */ | | /* D-Bus-API-dependent, moved to telepathy-glib-dbus.h in 1.0 */ | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|
| telepathy-interfaces.h | | telepathy-interfaces.h | |
| | | | |
| skipping to change at line 369 | | skipping to change at line 369 | |
| | | | |
| #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_SUBSCRIBE \ | | #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_SUBSCRIBE \ | |
| "org.freedesktop.Telepathy.Connection.Interface.ContactList/subscribe" | | "org.freedesktop.Telepathy.Connection.Interface.ContactList/subscribe" | |
| | | | |
| #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH \ | | #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH \ | |
| "org.freedesktop.Telepathy.Connection.Interface.ContactList/publish" | | "org.freedesktop.Telepathy.Connection.Interface.ContactList/publish" | |
| | | | |
| #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH_REQUEST \ | | #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_LIST_PUBLISH_REQUEST \ | |
| "org.freedesktop.Telepathy.Connection.Interface.ContactList/publish-request
" | | "org.freedesktop.Telepathy.Connection.Interface.ContactList/publish-request
" | |
| | | | |
|
| | | #define TP_IFACE_CONNECTION_INTERFACE_RENAMING \ | |
| | | "org.freedesktop.Telepathy.Connection.Interface.Renaming" | |
| | | | |
| | | #define TP_IFACE_QUARK_CONNECTION_INTERFACE_RENAMING \ | |
| | | (tp_iface_quark_connection_interface_renaming ()) | |
| | | | |
| | | GQuark tp_iface_quark_connection_interface_renaming (void); | |
| | | | |
| | | #define TP_IFACE_CONNECTION_INTERFACE_SIDECARS1 \ | |
| | | "org.freedesktop.Telepathy.Connection.Interface.Sidecars1" | |
| | | | |
| | | #define TP_IFACE_QUARK_CONNECTION_INTERFACE_SIDECARS1 \ | |
| | | (tp_iface_quark_connection_interface_sidecars1 ()) | |
| | | | |
| | | GQuark tp_iface_quark_connection_interface_sidecars1 (void); | |
| | | | |
| #define TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ | | #define TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ | |
| "org.freedesktop.Telepathy.Connection.Interface.SimplePresence" | | "org.freedesktop.Telepathy.Connection.Interface.SimplePresence" | |
| | | | |
| #define TP_IFACE_QUARK_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ | | #define TP_IFACE_QUARK_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ | |
| (tp_iface_quark_connection_interface_simple_presence ()) | | (tp_iface_quark_connection_interface_simple_presence ()) | |
| | | | |
| GQuark tp_iface_quark_connection_interface_simple_presence (void); | | GQuark tp_iface_quark_connection_interface_simple_presence (void); | |
| | | | |
| #define TP_PROP_CONNECTION_INTERFACE_SIMPLE_PRESENCE_STATUSES \ | | #define TP_PROP_CONNECTION_INTERFACE_SIMPLE_PRESENCE_STATUSES \ | |
| "org.freedesktop.Telepathy.Connection.Interface.SimplePresence.Statuses" | | "org.freedesktop.Telepathy.Connection.Interface.SimplePresence.Statuses" | |
| | | | |
| skipping to change at line 653 | | skipping to change at line 669 | |
| | | | |
| #define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_TRANSFERRED_BYTES \ | | #define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_TRANSFERRED_BYTES \ | |
| "org.freedesktop.Telepathy.Channel.Type.FileTransfer.TransferredBytes" | | "org.freedesktop.Telepathy.Channel.Type.FileTransfer.TransferredBytes" | |
| | | | |
| #define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET \ | | #define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_INITIAL_OFFSET \ | |
| "org.freedesktop.Telepathy.Channel.Type.FileTransfer.InitialOffset" | | "org.freedesktop.Telepathy.Channel.Type.FileTransfer.InitialOffset" | |
| | | | |
| #define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI \ | | #define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI \ | |
| "org.freedesktop.Telepathy.Channel.Type.FileTransfer.URI" | | "org.freedesktop.Telepathy.Channel.Type.FileTransfer.URI" | |
| | | | |
|
| | | #define TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_FILE_COLLECTION \ | |
| | | "org.freedesktop.Telepathy.Channel.Type.FileTransfer.FileCollection" | |
| | | | |
| #define TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA \ | | #define TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA \ | |
| "org.freedesktop.Telepathy.Channel.Type.StreamedMedia" | | "org.freedesktop.Telepathy.Channel.Type.StreamedMedia" | |
| | | | |
| #define TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA \ | | #define TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA \ | |
| (tp_iface_quark_channel_type_streamed_media ()) | | (tp_iface_quark_channel_type_streamed_media ()) | |
| | | | |
| GQuark tp_iface_quark_channel_type_streamed_media (void); | | GQuark tp_iface_quark_channel_type_streamed_media (void); | |
| | | | |
| #define TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO \ | | #define TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO \ | |
| "org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialAudio" | | "org.freedesktop.Telepathy.Channel.Type.StreamedMedia.InitialAudio" | |
| | | | |
| skipping to change at line 1370 | | skipping to change at line 1389 | |
| (tp_iface_quark_channel_dispatcher ()) | | (tp_iface_quark_channel_dispatcher ()) | |
| | | | |
| GQuark tp_iface_quark_channel_dispatcher (void); | | GQuark tp_iface_quark_channel_dispatcher (void); | |
| | | | |
| #define TP_PROP_CHANNEL_DISPATCHER_INTERFACES \ | | #define TP_PROP_CHANNEL_DISPATCHER_INTERFACES \ | |
| "org.freedesktop.Telepathy.ChannelDispatcher.Interfaces" | | "org.freedesktop.Telepathy.ChannelDispatcher.Interfaces" | |
| | | | |
| #define TP_PROP_CHANNEL_DISPATCHER_SUPPORTS_REQUEST_HINTS \ | | #define TP_PROP_CHANNEL_DISPATCHER_SUPPORTS_REQUEST_HINTS \ | |
| "org.freedesktop.Telepathy.ChannelDispatcher.SupportsRequestHints" | | "org.freedesktop.Telepathy.ChannelDispatcher.SupportsRequestHints" | |
| | | | |
|
| | | #define TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1 \ | |
| | | "org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages1" | |
| | | | |
| | | #define TP_IFACE_QUARK_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1 \ | |
| | | (tp_iface_quark_channel_dispatcher_interface_messages1 ()) | |
| | | | |
| | | GQuark tp_iface_quark_channel_dispatcher_interface_messages1 (void); | |
| | | | |
| #define TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \ | | #define TP_IFACE_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \ | |
| "org.freedesktop.Telepathy.ChannelDispatcher.Interface.OperationList" | | "org.freedesktop.Telepathy.ChannelDispatcher.Interface.OperationList" | |
| | | | |
| #define TP_IFACE_QUARK_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \ | | #define TP_IFACE_QUARK_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \ | |
| (tp_iface_quark_channel_dispatcher_interface_operation_list ()) | | (tp_iface_quark_channel_dispatcher_interface_operation_list ()) | |
| | | | |
| GQuark tp_iface_quark_channel_dispatcher_interface_operation_list (void); | | GQuark tp_iface_quark_channel_dispatcher_interface_operation_list (void); | |
| | | | |
| #define TP_PROP_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST_DISPATCH_OPERAT
IONS \ | | #define TP_PROP_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST_DISPATCH_OPERAT
IONS \ | |
| "org.freedesktop.Telepathy.ChannelDispatcher.Interface.OperationList.Dispat
chOperations" | | "org.freedesktop.Telepathy.ChannelDispatcher.Interface.OperationList.Dispat
chOperations" | |
| | | | |
End of changes. 3 change blocks. |
| 0 lines changed or deleted | | 27 lines changed or added | |
|
| tp-cli-channel-dispatcher.h | | tp-cli-channel-dispatcher.h | |
| | | | |
| skipping to change at line 101 | | skipping to change at line 101 | |
| | | | |
| TpProxyPendingCall *tp_cli_channel_dispatcher_call_present_channel (TpChann
elDispatcher *proxy, | | TpProxyPendingCall *tp_cli_channel_dispatcher_call_present_channel (TpChann
elDispatcher *proxy, | |
| gint timeout_ms, | | gint timeout_ms, | |
| const gchar *in_Channel, | | const gchar *in_Channel, | |
| gint64 in_User_Action_Time, | | gint64 in_User_Action_Time, | |
| tp_cli_channel_dispatcher_callback_for_present_channel callback, | | tp_cli_channel_dispatcher_callback_for_present_channel callback, | |
| gpointer user_data, | | gpointer user_data, | |
| GDestroyNotify destroy, | | GDestroyNotify destroy, | |
| GObject *weak_object); | | GObject *weak_object); | |
| | | | |
|
| | | typedef void (*tp_cli_channel_dispatcher_interface_messages1_callback_for_s | |
| | | end_message) (TpChannelDispatcher *proxy, | |
| | | const gchar *out_Token, | |
| | | const GError *error, gpointer user_data, | |
| | | GObject *weak_object); | |
| | | | |
| | | TpProxyPendingCall *tp_cli_channel_dispatcher_interface_messages1_call_send | |
| | | _message (TpChannelDispatcher *proxy, | |
| | | gint timeout_ms, | |
| | | const gchar *in_Account, | |
| | | const gchar *in_Target_ID, | |
| | | const GPtrArray *in_Message, | |
| | | guint in_Flags, | |
| | | tp_cli_channel_dispatcher_interface_messages1_callback_for_send_message | |
| | | callback, | |
| | | gpointer user_data, | |
| | | GDestroyNotify destroy, | |
| | | GObject *weak_object); | |
| | | | |
| typedef void (*tp_cli_channel_dispatcher_interface_operation_list_signal_ca
llback_new_dispatch_operation) (TpChannelDispatcher *proxy, | | typedef void (*tp_cli_channel_dispatcher_interface_operation_list_signal_ca
llback_new_dispatch_operation) (TpChannelDispatcher *proxy, | |
| const gchar *arg_Dispatch_Operation, | | const gchar *arg_Dispatch_Operation, | |
| GHashTable *arg_Properties, | | GHashTable *arg_Properties, | |
| gpointer user_data, GObject *weak_object); | | gpointer user_data, GObject *weak_object); | |
| TpProxySignalConnection *tp_cli_channel_dispatcher_interface_operation_list
_connect_to_new_dispatch_operation (TpChannelDispatcher *proxy, | | TpProxySignalConnection *tp_cli_channel_dispatcher_interface_operation_list
_connect_to_new_dispatch_operation (TpChannelDispatcher *proxy, | |
| tp_cli_channel_dispatcher_interface_operation_list_signal_callback_new_
dispatch_operation callback, | | tp_cli_channel_dispatcher_interface_operation_list_signal_callback_new_
dispatch_operation callback, | |
| gpointer user_data, | | gpointer user_data, | |
| GDestroyNotify destroy, | | GDestroyNotify destroy, | |
| GObject *weak_object, | | GObject *weak_object, | |
| GError **error); | | GError **error); | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 19 lines changed or added | |
|
| tp-cli-connection.h | | tp-cli-connection.h | |
| | | | |
| skipping to change at line 1756 | | skipping to change at line 1756 | |
| GObject *weak_object); | | GObject *weak_object); | |
| | | | |
| #ifndef TP_DISABLE_DEPRECATED | | #ifndef TP_DISABLE_DEPRECATED | |
| gboolean tp_cli_connection_interface_presence_run_set_status (TpConnection
*proxy, | | gboolean tp_cli_connection_interface_presence_run_set_status (TpConnection
*proxy, | |
| gint timeout_ms, | | gint timeout_ms, | |
| GHashTable *in_Statuses, | | GHashTable *in_Statuses, | |
| GError **error, | | GError **error, | |
| GMainLoop **loop) _TP_GNUC_DEPRECATED; | | GMainLoop **loop) _TP_GNUC_DEPRECATED; | |
| #endif /* not TP_DISABLE_DEPRECATED */ | | #endif /* not TP_DISABLE_DEPRECATED */ | |
| | | | |
|
| | | typedef void (*tp_cli_connection_interface_renaming_signal_callback_renamed | |
| | | ) (TpConnection *proxy, | |
| | | guint arg_Original, | |
| | | guint arg_New, | |
| | | gpointer user_data, GObject *weak_object); | |
| | | TpProxySignalConnection *tp_cli_connection_interface_renaming_connect_to_re | |
| | | named (TpConnection *proxy, | |
| | | tp_cli_connection_interface_renaming_signal_callback_renamed callback, | |
| | | gpointer user_data, | |
| | | GDestroyNotify destroy, | |
| | | GObject *weak_object, | |
| | | GError **error); | |
| | | | |
| | | typedef void (*tp_cli_connection_interface_renaming_callback_for_request_re | |
| | | name) (TpConnection *proxy, | |
| | | const GError *error, gpointer user_data, | |
| | | GObject *weak_object); | |
| | | | |
| | | TpProxyPendingCall *tp_cli_connection_interface_renaming_call_request_renam | |
| | | e (TpConnection *proxy, | |
| | | gint timeout_ms, | |
| | | const gchar *in_Identifier, | |
| | | tp_cli_connection_interface_renaming_callback_for_request_rename callba | |
| | | ck, | |
| | | gpointer user_data, | |
| | | GDestroyNotify destroy, | |
| | | GObject *weak_object); | |
| | | | |
| typedef void (*tp_cli_connection_interface_requests_signal_callback_new_cha
nnels) (TpConnection *proxy, | | typedef void (*tp_cli_connection_interface_requests_signal_callback_new_cha
nnels) (TpConnection *proxy, | |
| const GPtrArray *arg_Channels, | | const GPtrArray *arg_Channels, | |
| gpointer user_data, GObject *weak_object); | | gpointer user_data, GObject *weak_object); | |
| TpProxySignalConnection *tp_cli_connection_interface_requests_connect_to_ne
w_channels (TpConnection *proxy, | | TpProxySignalConnection *tp_cli_connection_interface_requests_connect_to_ne
w_channels (TpConnection *proxy, | |
| tp_cli_connection_interface_requests_signal_callback_new_channels callb
ack, | | tp_cli_connection_interface_requests_signal_callback_new_channels callb
ack, | |
| gpointer user_data, | | gpointer user_data, | |
| GDestroyNotify destroy, | | GDestroyNotify destroy, | |
| GObject *weak_object, | | GObject *weak_object, | |
| GError **error); | | GError **error); | |
| | | | |
| | | | |
| skipping to change at line 1836 | | skipping to change at line 1859 | |
| typedef void (*tp_cli_connection_interface_service_point_signal_callback_se
rvice_points_changed) (TpConnection *proxy, | | typedef void (*tp_cli_connection_interface_service_point_signal_callback_se
rvice_points_changed) (TpConnection *proxy, | |
| const GPtrArray *arg_Service_Points, | | const GPtrArray *arg_Service_Points, | |
| gpointer user_data, GObject *weak_object); | | gpointer user_data, GObject *weak_object); | |
| TpProxySignalConnection *tp_cli_connection_interface_service_point_connect_
to_service_points_changed (TpConnection *proxy, | | TpProxySignalConnection *tp_cli_connection_interface_service_point_connect_
to_service_points_changed (TpConnection *proxy, | |
| tp_cli_connection_interface_service_point_signal_callback_service_point
s_changed callback, | | tp_cli_connection_interface_service_point_signal_callback_service_point
s_changed callback, | |
| gpointer user_data, | | gpointer user_data, | |
| GDestroyNotify destroy, | | GDestroyNotify destroy, | |
| GObject *weak_object, | | GObject *weak_object, | |
| GError **error); | | GError **error); | |
| | | | |
|
| | | typedef void (*tp_cli_connection_interface_sidecars1_callback_for_ensure_si | |
| | | decar) (TpConnection *proxy, | |
| | | const gchar *out_Path, | |
| | | GHashTable *out_Properties, | |
| | | const GError *error, gpointer user_data, | |
| | | GObject *weak_object); | |
| | | | |
| | | TpProxyPendingCall *tp_cli_connection_interface_sidecars1_call_ensure_sidec | |
| | | ar (TpConnection *proxy, | |
| | | gint timeout_ms, | |
| | | const gchar *in_Main_Interface, | |
| | | tp_cli_connection_interface_sidecars1_callback_for_ensure_sidecar callb | |
| | | ack, | |
| | | gpointer user_data, | |
| | | GDestroyNotify destroy, | |
| | | GObject *weak_object); | |
| | | | |
| typedef void (*tp_cli_connection_interface_simple_presence_signal_callback_
presences_changed) (TpConnection *proxy, | | typedef void (*tp_cli_connection_interface_simple_presence_signal_callback_
presences_changed) (TpConnection *proxy, | |
| GHashTable *arg_Presence, | | GHashTable *arg_Presence, | |
| gpointer user_data, GObject *weak_object); | | gpointer user_data, GObject *weak_object); | |
| TpProxySignalConnection *tp_cli_connection_interface_simple_presence_connec
t_to_presences_changed (TpConnection *proxy, | | TpProxySignalConnection *tp_cli_connection_interface_simple_presence_connec
t_to_presences_changed (TpConnection *proxy, | |
| tp_cli_connection_interface_simple_presence_signal_callback_presences_c
hanged callback, | | tp_cli_connection_interface_simple_presence_signal_callback_presences_c
hanged callback, | |
| gpointer user_data, | | gpointer user_data, | |
| GDestroyNotify destroy, | | GDestroyNotify destroy, | |
| GObject *weak_object, | | GObject *weak_object, | |
| GError **error); | | GError **error); | |
| | | | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 45 lines changed or added | |
|
| tp-svc-channel-dispatcher.h | | tp-svc-channel-dispatcher.h | |
| | | | |
| skipping to change at line 135 | | skipping to change at line 135 | |
| void tp_svc_channel_dispatcher_implement_present_channel (TpSvcChannelDispa
tcherClass *klass, tp_svc_channel_dispatcher_present_channel_impl impl); | | void tp_svc_channel_dispatcher_implement_present_channel (TpSvcChannelDispa
tcherClass *klass, tp_svc_channel_dispatcher_present_channel_impl impl); | |
| static inline | | static inline | |
| /* this comment is to stop gtkdoc realising this is static */ | | /* this comment is to stop gtkdoc realising this is static */ | |
| void tp_svc_channel_dispatcher_return_from_present_channel (DBusGMethodInvo
cation *context); | | void tp_svc_channel_dispatcher_return_from_present_channel (DBusGMethodInvo
cation *context); | |
| static inline void | | static inline void | |
| tp_svc_channel_dispatcher_return_from_present_channel (DBusGMethodInvocatio
n *context) | | tp_svc_channel_dispatcher_return_from_present_channel (DBusGMethodInvocatio
n *context) | |
| { | | { | |
| dbus_g_method_return (context); | | dbus_g_method_return (context); | |
| } | | } | |
| | | | |
|
| | | typedef struct _TpSvcChannelDispatcherInterfaceMessages1 TpSvcChannelDispat | |
| | | cherInterfaceMessages1; | |
| | | | |
| | | typedef struct _TpSvcChannelDispatcherInterfaceMessages1Class TpSvcChannelD | |
| | | ispatcherInterfaceMessages1Class; | |
| | | | |
| | | GType tp_svc_channel_dispatcher_interface_messages1_get_type (void); | |
| | | #define TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1 \ | |
| | | (tp_svc_channel_dispatcher_interface_messages1_get_type ()) | |
| | | #define TP_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1(obj) \ | |
| | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFA | |
| | | CE_MESSAGES1, TpSvcChannelDispatcherInterfaceMessages1)) | |
| | | #define TP_IS_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1(obj) \ | |
| | | (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFA | |
| | | CE_MESSAGES1)) | |
| | | #define TP_SVC_CHANNEL_DISPATCHER_INTERFACE_MESSAGES1_GET_CLASS(obj) \ | |
| | | (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER_INTE | |
| | | RFACE_MESSAGES1, TpSvcChannelDispatcherInterfaceMessages1Class)) | |
| | | | |
| | | typedef void (*tp_svc_channel_dispatcher_interface_messages1_send_message_i | |
| | | mpl) (TpSvcChannelDispatcherInterfaceMessages1 *self, | |
| | | const gchar *in_Account, | |
| | | const gchar *in_Target_ID, | |
| | | const GPtrArray *in_Message, | |
| | | guint in_Flags, | |
| | | DBusGMethodInvocation *context); | |
| | | void tp_svc_channel_dispatcher_interface_messages1_implement_send_message ( | |
| | | TpSvcChannelDispatcherInterfaceMessages1Class *klass, tp_svc_channel_dispat | |
| | | cher_interface_messages1_send_message_impl impl); | |
| | | static inline | |
| | | /* this comment is to stop gtkdoc realising this is static */ | |
| | | void tp_svc_channel_dispatcher_interface_messages1_return_from_send_message | |
| | | (DBusGMethodInvocation *context, | |
| | | const gchar *out_Token); | |
| | | static inline void | |
| | | tp_svc_channel_dispatcher_interface_messages1_return_from_send_message (DBu | |
| | | sGMethodInvocation *context, | |
| | | const gchar *out_Token) | |
| | | { | |
| | | dbus_g_method_return (context, | |
| | | out_Token); | |
| | | } | |
| | | | |
| typedef struct _TpSvcChannelDispatcherInterfaceOperationList TpSvcChannelDi
spatcherInterfaceOperationList; | | typedef struct _TpSvcChannelDispatcherInterfaceOperationList TpSvcChannelDi
spatcherInterfaceOperationList; | |
| | | | |
| typedef struct _TpSvcChannelDispatcherInterfaceOperationListClass TpSvcChan
nelDispatcherInterfaceOperationListClass; | | typedef struct _TpSvcChannelDispatcherInterfaceOperationListClass TpSvcChan
nelDispatcherInterfaceOperationListClass; | |
| | | | |
| GType tp_svc_channel_dispatcher_interface_operation_list_get_type (void); | | GType tp_svc_channel_dispatcher_interface_operation_list_get_type (void); | |
| #define TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \ | | #define TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST \ | |
| (tp_svc_channel_dispatcher_interface_operation_list_get_type ()) | | (tp_svc_channel_dispatcher_interface_operation_list_get_type ()) | |
| #define TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST(obj) \ | | #define TP_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFA
CE_OPERATION_LIST, TpSvcChannelDispatcherInterfaceOperationList)) | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CHANNEL_DISPATCHER_INTERFA
CE_OPERATION_LIST, TpSvcChannelDispatcherInterfaceOperationList)) | |
| #define TP_IS_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST(obj) \ | | #define TP_IS_SVC_CHANNEL_DISPATCHER_INTERFACE_OPERATION_LIST(obj) \ | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 43 lines changed or added | |
|
| tp-svc-connection.h | | tp-svc-connection.h | |
| | | | |
| skipping to change at line 1409 | | skipping to change at line 1409 | |
| void tp_svc_connection_interface_presence_return_from_set_status (DBusGMeth
odInvocation *context); | | void tp_svc_connection_interface_presence_return_from_set_status (DBusGMeth
odInvocation *context); | |
| static inline void | | static inline void | |
| tp_svc_connection_interface_presence_return_from_set_status (DBusGMethodInv
ocation *context) | | tp_svc_connection_interface_presence_return_from_set_status (DBusGMethodInv
ocation *context) | |
| { | | { | |
| dbus_g_method_return (context); | | dbus_g_method_return (context); | |
| } | | } | |
| | | | |
| void tp_svc_connection_interface_presence_emit_presence_update (gpointer in
stance, | | void tp_svc_connection_interface_presence_emit_presence_update (gpointer in
stance, | |
| GHashTable *arg_Presence); | | GHashTable *arg_Presence); | |
| | | | |
|
| | | typedef struct _TpSvcConnectionInterfaceRenaming TpSvcConnectionInterfaceRe | |
| | | naming; | |
| | | | |
| | | typedef struct _TpSvcConnectionInterfaceRenamingClass TpSvcConnectionInterf | |
| | | aceRenamingClass; | |
| | | | |
| | | GType tp_svc_connection_interface_renaming_get_type (void); | |
| | | #define TP_TYPE_SVC_CONNECTION_INTERFACE_RENAMING \ | |
| | | (tp_svc_connection_interface_renaming_get_type ()) | |
| | | #define TP_SVC_CONNECTION_INTERFACE_RENAMING(obj) \ | |
| | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_RENAM | |
| | | ING, TpSvcConnectionInterfaceRenaming)) | |
| | | #define TP_IS_SVC_CONNECTION_INTERFACE_RENAMING(obj) \ | |
| | | (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_RENAM | |
| | | ING)) | |
| | | #define TP_SVC_CONNECTION_INTERFACE_RENAMING_GET_CLASS(obj) \ | |
| | | (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_RE | |
| | | NAMING, TpSvcConnectionInterfaceRenamingClass)) | |
| | | | |
| | | typedef void (*tp_svc_connection_interface_renaming_request_rename_impl) (T | |
| | | pSvcConnectionInterfaceRenaming *self, | |
| | | const gchar *in_Identifier, | |
| | | DBusGMethodInvocation *context); | |
| | | void tp_svc_connection_interface_renaming_implement_request_rename (TpSvcCo | |
| | | nnectionInterfaceRenamingClass *klass, tp_svc_connection_interface_renaming | |
| | | _request_rename_impl impl); | |
| | | static inline | |
| | | /* this comment is to stop gtkdoc realising this is static */ | |
| | | void tp_svc_connection_interface_renaming_return_from_request_rename (DBusG | |
| | | MethodInvocation *context); | |
| | | static inline void | |
| | | tp_svc_connection_interface_renaming_return_from_request_rename (DBusGMetho | |
| | | dInvocation *context) | |
| | | { | |
| | | dbus_g_method_return (context); | |
| | | } | |
| | | | |
| | | void tp_svc_connection_interface_renaming_emit_renamed (gpointer instance, | |
| | | guint arg_Original, | |
| | | guint arg_New); | |
| | | | |
| typedef struct _TpSvcConnectionInterfaceRequests TpSvcConnectionInterfaceRe
quests; | | typedef struct _TpSvcConnectionInterfaceRequests TpSvcConnectionInterfaceRe
quests; | |
| | | | |
| typedef struct _TpSvcConnectionInterfaceRequestsClass TpSvcConnectionInterf
aceRequestsClass; | | typedef struct _TpSvcConnectionInterfaceRequestsClass TpSvcConnectionInterf
aceRequestsClass; | |
| | | | |
| GType tp_svc_connection_interface_requests_get_type (void); | | GType tp_svc_connection_interface_requests_get_type (void); | |
| #define TP_TYPE_SVC_CONNECTION_INTERFACE_REQUESTS \ | | #define TP_TYPE_SVC_CONNECTION_INTERFACE_REQUESTS \ | |
| (tp_svc_connection_interface_requests_get_type ()) | | (tp_svc_connection_interface_requests_get_type ()) | |
| #define TP_SVC_CONNECTION_INTERFACE_REQUESTS(obj) \ | | #define TP_SVC_CONNECTION_INTERFACE_REQUESTS(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_REQUE
STS, TpSvcConnectionInterfaceRequests)) | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_REQUE
STS, TpSvcConnectionInterfaceRequests)) | |
| #define TP_IS_SVC_CONNECTION_INTERFACE_REQUESTS(obj) \ | | #define TP_IS_SVC_CONNECTION_INTERFACE_REQUESTS(obj) \ | |
| | | | |
| skipping to change at line 1486 | | skipping to change at line 1517 | |
| #define TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT(obj) \ | | #define TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SERVI
CE_POINT, TpSvcConnectionInterfaceServicePoint)) | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SERVI
CE_POINT, TpSvcConnectionInterfaceServicePoint)) | |
| #define TP_IS_SVC_CONNECTION_INTERFACE_SERVICE_POINT(obj) \ | | #define TP_IS_SVC_CONNECTION_INTERFACE_SERVICE_POINT(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SERVI
CE_POINT)) | | (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SERVI
CE_POINT)) | |
| #define TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT_GET_CLASS(obj) \ | | #define TP_SVC_CONNECTION_INTERFACE_SERVICE_POINT_GET_CLASS(obj) \ | |
| (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SE
RVICE_POINT, TpSvcConnectionInterfaceServicePointClass)) | | (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SE
RVICE_POINT, TpSvcConnectionInterfaceServicePointClass)) | |
| | | | |
| void tp_svc_connection_interface_service_point_emit_service_points_changed
(gpointer instance, | | void tp_svc_connection_interface_service_point_emit_service_points_changed
(gpointer instance, | |
| const GPtrArray *arg_Service_Points); | | const GPtrArray *arg_Service_Points); | |
| | | | |
|
| | | typedef struct _TpSvcConnectionInterfaceSidecars1 TpSvcConnectionInterfaceS | |
| | | idecars1; | |
| | | | |
| | | typedef struct _TpSvcConnectionInterfaceSidecars1Class TpSvcConnectionInter | |
| | | faceSidecars1Class; | |
| | | | |
| | | GType tp_svc_connection_interface_sidecars1_get_type (void); | |
| | | #define TP_TYPE_SVC_CONNECTION_INTERFACE_SIDECARS1 \ | |
| | | (tp_svc_connection_interface_sidecars1_get_type ()) | |
| | | #define TP_SVC_CONNECTION_INTERFACE_SIDECARS1(obj) \ | |
| | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SIDEC | |
| | | ARS1, TpSvcConnectionInterfaceSidecars1)) | |
| | | #define TP_IS_SVC_CONNECTION_INTERFACE_SIDECARS1(obj) \ | |
| | | (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SIDEC | |
| | | ARS1)) | |
| | | #define TP_SVC_CONNECTION_INTERFACE_SIDECARS1_GET_CLASS(obj) \ | |
| | | (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SI | |
| | | DECARS1, TpSvcConnectionInterfaceSidecars1Class)) | |
| | | | |
| | | typedef void (*tp_svc_connection_interface_sidecars1_ensure_sidecar_impl) ( | |
| | | TpSvcConnectionInterfaceSidecars1 *self, | |
| | | const gchar *in_Main_Interface, | |
| | | DBusGMethodInvocation *context); | |
| | | void tp_svc_connection_interface_sidecars1_implement_ensure_sidecar (TpSvcC | |
| | | onnectionInterfaceSidecars1Class *klass, tp_svc_connection_interface_sideca | |
| | | rs1_ensure_sidecar_impl impl); | |
| | | static inline | |
| | | /* this comment is to stop gtkdoc realising this is static */ | |
| | | void tp_svc_connection_interface_sidecars1_return_from_ensure_sidecar (DBus | |
| | | GMethodInvocation *context, | |
| | | const gchar *out_Path, | |
| | | GHashTable *out_Properties); | |
| | | static inline void | |
| | | tp_svc_connection_interface_sidecars1_return_from_ensure_sidecar (DBusGMeth | |
| | | odInvocation *context, | |
| | | const gchar *out_Path, | |
| | | GHashTable *out_Properties) | |
| | | { | |
| | | dbus_g_method_return (context, | |
| | | out_Path, | |
| | | out_Properties); | |
| | | } | |
| | | | |
| typedef struct _TpSvcConnectionInterfaceSimplePresence TpSvcConnectionInter
faceSimplePresence; | | typedef struct _TpSvcConnectionInterfaceSimplePresence TpSvcConnectionInter
faceSimplePresence; | |
| | | | |
| typedef struct _TpSvcConnectionInterfaceSimplePresenceClass TpSvcConnection
InterfaceSimplePresenceClass; | | typedef struct _TpSvcConnectionInterfaceSimplePresenceClass TpSvcConnection
InterfaceSimplePresenceClass; | |
| | | | |
| GType tp_svc_connection_interface_simple_presence_get_type (void); | | GType tp_svc_connection_interface_simple_presence_get_type (void); | |
| #define TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ | | #define TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE \ | |
| (tp_svc_connection_interface_simple_presence_get_type ()) | | (tp_svc_connection_interface_simple_presence_get_type ()) | |
| #define TP_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE(obj) \ | | #define TP_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPL
E_PRESENCE, TpSvcConnectionInterfaceSimplePresence)) | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_SIMPL
E_PRESENCE, TpSvcConnectionInterfaceSimplePresence)) | |
| #define TP_IS_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE(obj) \ | | #define TP_IS_SVC_CONNECTION_INTERFACE_SIMPLE_PRESENCE(obj) \ | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 84 lines changed or added | |
|
| util.h | | util.h | |
| | | | |
| skipping to change at line 120 | | skipping to change at line 120 | |
| const gchar *detailed_signal, GCallback c_handler, gpointer gobject, | | const gchar *detailed_signal, GCallback c_handler, gpointer gobject, | |
| GConnectFlags connect_flags); | | GConnectFlags connect_flags); | |
| | | | |
| GValueArray *tp_value_array_build (gsize length, | | GValueArray *tp_value_array_build (gsize length, | |
| GType type, | | GType type, | |
| ...) G_GNUC_WARN_UNUSED_RESULT; | | ...) G_GNUC_WARN_UNUSED_RESULT; | |
| void tp_value_array_unpack (GValueArray *array, | | void tp_value_array_unpack (GValueArray *array, | |
| gsize len, | | gsize len, | |
| ...); | | ...); | |
| | | | |
|
| | | /* Work around GLib having deprecated something that is part of our API. */ | |
| | | _TP_AVAILABLE_IN_0_24 | |
| | | void tp_value_array_free (GValueArray *va); | |
| | | #if TP_VERSION_MAX_ALLOWED >= TP_VERSION_0_24 | |
| | | #define tp_value_array_free(va) _tp_value_array_free_inline (va) | |
| | | #ifndef __GTK_DOC_IGNORE__ /* gtk-doc can't parse this */ | |
| | | static inline void | |
| | | _tp_value_array_free_inline (GValueArray *va) | |
| | | { | |
| | | G_GNUC_BEGIN_IGNORE_DEPRECATIONS | |
| | | g_value_array_free (va); | |
| | | G_GNUC_END_IGNORE_DEPRECATIONS | |
| | | } | |
| | | #endif | |
| | | #endif | |
| | | | |
| /* See https://bugzilla.gnome.org/show_bug.cgi?id=680813 for glib inclusion
*/ | | /* See https://bugzilla.gnome.org/show_bug.cgi?id=680813 for glib inclusion
*/ | |
| typedef struct _TpWeakRef TpWeakRef; | | typedef struct _TpWeakRef TpWeakRef; | |
| TpWeakRef *tp_weak_ref_new (gpointer object, | | TpWeakRef *tp_weak_ref_new (gpointer object, | |
| gpointer user_data, | | gpointer user_data, | |
| GDestroyNotify destroy) G_GNUC_WARN_UNUSED_RESULT; | | GDestroyNotify destroy) G_GNUC_WARN_UNUSED_RESULT; | |
| gpointer tp_weak_ref_get_user_data (TpWeakRef *self) G_GNUC_WARN_UNUSED_RES
ULT; | | gpointer tp_weak_ref_get_user_data (TpWeakRef *self) G_GNUC_WARN_UNUSED_RES
ULT; | |
| gpointer tp_weak_ref_dup_object (TpWeakRef *self) G_GNUC_WARN_UNUSED_RESULT
; | | gpointer tp_weak_ref_dup_object (TpWeakRef *self) G_GNUC_WARN_UNUSED_RESULT
; | |
| void tp_weak_ref_destroy (TpWeakRef *self); | | void tp_weak_ref_destroy (TpWeakRef *self); | |
| | | | |
| #define tp_clear_pointer(pp, destroy) \ | | #define tp_clear_pointer(pp, destroy) \ | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 16 lines changed or added | |
|