| account.h | | account.h | |
| | | | |
| skipping to change at line 93 | | skipping to change at line 93 | |
| TpConnection *tp_account_get_connection (TpAccount *account); | | TpConnection *tp_account_get_connection (TpAccount *account); | |
| | | | |
| TpConnection *tp_account_ensure_connection (TpAccount *account, | | TpConnection *tp_account_ensure_connection (TpAccount *account, | |
| const gchar *path); | | const gchar *path); | |
| | | | |
| const gchar *tp_account_get_display_name (TpAccount *account); | | const gchar *tp_account_get_display_name (TpAccount *account); | |
| | | | |
| const gchar *tp_account_get_connection_manager (TpAccount *account); | | const gchar *tp_account_get_connection_manager (TpAccount *account); | |
| | | | |
| const gchar *tp_account_get_protocol (TpAccount *account); | | const gchar *tp_account_get_protocol (TpAccount *account); | |
|
| | | const gchar *tp_account_get_service (TpAccount *self); | |
| | | | |
| const gchar *tp_account_get_icon_name (TpAccount *account); | | const gchar *tp_account_get_icon_name (TpAccount *account); | |
| | | | |
| void tp_account_set_enabled_async (TpAccount *account, | | void tp_account_set_enabled_async (TpAccount *account, | |
| gboolean enabled, GAsyncReadyCallback callback, gpointer user_data); | | gboolean enabled, GAsyncReadyCallback callback, gpointer user_data); | |
| | | | |
| gboolean tp_account_set_enabled_finish (TpAccount *account, | | gboolean tp_account_set_enabled_finish (TpAccount *account, | |
| GAsyncResult *result, GError **error); | | GAsyncResult *result, GError **error); | |
| | | | |
| void tp_account_reconnect_async (TpAccount *account, | | void tp_account_reconnect_async (TpAccount *account, | |
| | | | |
| skipping to change at line 139 | | skipping to change at line 140 | |
| gboolean tp_account_set_display_name_finish (TpAccount *account, | | gboolean tp_account_set_display_name_finish (TpAccount *account, | |
| GAsyncResult *result, GError **error); | | GAsyncResult *result, GError **error); | |
| | | | |
| void tp_account_set_icon_name_async (TpAccount *account, | | void tp_account_set_icon_name_async (TpAccount *account, | |
| const gchar *icon_name, GAsyncReadyCallback callback, | | const gchar *icon_name, GAsyncReadyCallback callback, | |
| gpointer user_data); | | gpointer user_data); | |
| | | | |
| gboolean tp_account_set_icon_name_finish (TpAccount *account, | | gboolean tp_account_set_icon_name_finish (TpAccount *account, | |
| GAsyncResult *result, GError **error); | | GAsyncResult *result, GError **error); | |
| | | | |
|
| | | void tp_account_set_service_async (TpAccount *self, | |
| | | const gchar *service, GAsyncReadyCallback callback, | |
| | | gpointer user_data); | |
| | | | |
| | | gboolean tp_account_set_service_finish (TpAccount *self, | |
| | | GAsyncResult *result, GError **error); | |
| | | | |
| void tp_account_request_presence_async (TpAccount *account, | | void tp_account_request_presence_async (TpAccount *account, | |
| TpConnectionPresenceType type, const gchar *status, const gchar *messag
e, | | TpConnectionPresenceType type, const gchar *status, const gchar *messag
e, | |
| GAsyncReadyCallback callback, gpointer user_data); | | GAsyncReadyCallback callback, gpointer user_data); | |
| | | | |
| gboolean tp_account_request_presence_finish (TpAccount *account, | | gboolean tp_account_request_presence_finish (TpAccount *account, | |
| GAsyncResult *result, GError **error); | | GAsyncResult *result, GError **error); | |
| | | | |
| gboolean tp_account_get_connect_automatically (TpAccount *account); | | gboolean tp_account_get_connect_automatically (TpAccount *account); | |
| | | | |
| void tp_account_set_connect_automatically_async (TpAccount *account, | | void tp_account_set_connect_automatically_async (TpAccount *account, | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 8 lines changed or added | |
|
| group-mixin.h | | group-mixin.h | |
| | | | |
| skipping to change at line 205 | | skipping to change at line 205 | |
| gboolean tp_group_mixin_get_all_members (GObject *obj, | | gboolean tp_group_mixin_get_all_members (GObject *obj, | |
| GArray **members, GArray **local_pending, GArray **remote_pending, | | GArray **members, GArray **local_pending, GArray **remote_pending, | |
| GError **error); | | GError **error); | |
| | | | |
| gboolean tp_group_mixin_get_handle_owners (GObject *obj, | | gboolean tp_group_mixin_get_handle_owners (GObject *obj, | |
| const GArray *handles, GArray **ret, GError **error); | | const GArray *handles, GArray **ret, GError **error); | |
| | | | |
| void tp_group_mixin_change_flags (GObject *obj, | | void tp_group_mixin_change_flags (GObject *obj, | |
| TpChannelGroupFlags add, TpChannelGroupFlags del); | | TpChannelGroupFlags add, TpChannelGroupFlags del); | |
| gboolean tp_group_mixin_change_members (GObject *obj, | | gboolean tp_group_mixin_change_members (GObject *obj, | |
|
| const gchar *message, TpIntSet *add, TpIntSet *del, | | const gchar *message, const TpIntSet *add, const TpIntSet *del, | |
| TpIntSet *add_local_pending, TpIntSet *add_remote_pending, TpHandle act | | const TpIntSet *add_local_pending, const TpIntSet *add_remote_pending, | |
| or, | | TpHandle actor, TpChannelGroupChangeReason reason); | |
| TpChannelGroupChangeReason reason); | | gboolean tp_group_mixin_change_members_detailed (GObject *obj, | |
| gboolean tp_group_mixin_change_members_detailed (GObject *obj, TpIntSet *ad | | const TpIntSet *add, const TpIntSet *del, | |
| d, | | const TpIntSet *add_local_pending, const TpIntSet *add_remote_pending, | |
| TpIntSet *del, TpIntSet *add_local_pending, TpIntSet *add_remote_pendin | | | |
| g, | | | |
| const GHashTable *details); | | const GHashTable *details); | |
| void tp_group_mixin_change_self_handle (GObject *obj, | | void tp_group_mixin_change_self_handle (GObject *obj, | |
| TpHandle new_self_handle); | | TpHandle new_self_handle); | |
| | | | |
| void tp_group_mixin_add_handle_owner (GObject *obj, | | void tp_group_mixin_add_handle_owner (GObject *obj, | |
| TpHandle local_handle, TpHandle owner_handle); | | TpHandle local_handle, TpHandle owner_handle); | |
| void tp_group_mixin_add_handle_owners (GObject *obj, | | void tp_group_mixin_add_handle_owners (GObject *obj, | |
| GHashTable *local_to_owner_handle); | | GHashTable *local_to_owner_handle); | |
| | | | |
| void tp_group_mixin_get_dbus_property (GObject *object, | | void tp_group_mixin_get_dbus_property (GObject *object, | |
| | | | |
End of changes. 1 change blocks. |
| 8 lines changed or deleted | | 6 lines changed or added | |
|
| telepathy-enums.h | | telepathy-enums.h | |
| | | | |
| skipping to change at line 376 | | skipping to change at line 376 | |
| TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2, | | TP_MEDIA_STREAM_TRANSPORT_TYPE_RELAY = 2, | |
| } TpMediaStreamTransportType; | | } TpMediaStreamTransportType; | |
| #define NUM_TP_MEDIA_STREAM_TRANSPORT_TYPES (2+1) | | #define NUM_TP_MEDIA_STREAM_TRANSPORT_TYPES (2+1) | |
| | | | |
| typedef enum { | | typedef enum { | |
| TP_PROPERTY_FLAG_READ = 1, | | TP_PROPERTY_FLAG_READ = 1, | |
| TP_PROPERTY_FLAG_WRITE = 2, | | TP_PROPERTY_FLAG_WRITE = 2, | |
| } TpPropertyFlags; | | } TpPropertyFlags; | |
| | | | |
| typedef enum { | | typedef enum { | |
|
| | | TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PARAMETERS = 1, | |
| | | TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_ENABLED = 2, | |
| | | TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_PRESENCE = 4, | |
| | | TP_STORAGE_RESTRICTION_FLAG_CANNOT_SET_SERVICE = 8, | |
| | | } TpStorageRestrictionFlags; | |
| | | | |
| | | typedef enum { | |
| TP_DEBUG_LEVEL_ERROR = 0, | | TP_DEBUG_LEVEL_ERROR = 0, | |
| TP_DEBUG_LEVEL_CRITICAL = 1, | | TP_DEBUG_LEVEL_CRITICAL = 1, | |
| TP_DEBUG_LEVEL_WARNING = 2, | | TP_DEBUG_LEVEL_WARNING = 2, | |
| TP_DEBUG_LEVEL_MESSAGE = 3, | | TP_DEBUG_LEVEL_MESSAGE = 3, | |
| TP_DEBUG_LEVEL_INFO = 4, | | TP_DEBUG_LEVEL_INFO = 4, | |
| TP_DEBUG_LEVEL_DEBUG = 5, | | TP_DEBUG_LEVEL_DEBUG = 5, | |
| } TpDebugLevel; | | } TpDebugLevel; | |
| #define NUM_TP_DEBUG_LEVELS (5+1) | | #define NUM_TP_DEBUG_LEVELS (5+1) | |
| | | | |
| #ifdef __cplusplus | | #ifdef __cplusplus | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 7 lines changed or added | |
|
| telepathy-interfaces.h | | telepathy-interfaces.h | |
| | | | |
| skipping to change at line 13 | | skipping to change at line 13 | |
| */ | | */ | |
| | | | |
| #define TP_IFACE_CONNECTION_MANAGER \ | | #define TP_IFACE_CONNECTION_MANAGER \ | |
| "org.freedesktop.Telepathy.ConnectionManager" | | "org.freedesktop.Telepathy.ConnectionManager" | |
| | | | |
| #define TP_IFACE_QUARK_CONNECTION_MANAGER \ | | #define TP_IFACE_QUARK_CONNECTION_MANAGER \ | |
| (tp_iface_quark_connection_manager ()) | | (tp_iface_quark_connection_manager ()) | |
| | | | |
| GQuark tp_iface_quark_connection_manager (void); | | GQuark tp_iface_quark_connection_manager (void); | |
| | | | |
|
| | | #define TP_PROP_CONNECTION_MANAGER_PROTOCOLS \ | |
| | | "org.freedesktop.Telepathy.ConnectionManager.Protocols" | |
| | | | |
| #define TP_PROP_CONNECTION_MANAGER_INTERFACES \ | | #define TP_PROP_CONNECTION_MANAGER_INTERFACES \ | |
| "org.freedesktop.Telepathy.ConnectionManager.Interfaces" | | "org.freedesktop.Telepathy.ConnectionManager.Interfaces" | |
| | | | |
| #define TP_IFACE_CONNECTION \ | | #define TP_IFACE_CONNECTION \ | |
| "org.freedesktop.Telepathy.Connection" | | "org.freedesktop.Telepathy.Connection" | |
| | | | |
| #define TP_IFACE_QUARK_CONNECTION \ | | #define TP_IFACE_QUARK_CONNECTION \ | |
| (tp_iface_quark_connection ()) | | (tp_iface_quark_connection ()) | |
| | | | |
| GQuark tp_iface_quark_connection (void); | | GQuark tp_iface_quark_connection (void); | |
| | | | |
| skipping to change at line 121 | | skipping to change at line 124 | |
| "org.freedesktop.Telepathy.Connection.Interface.Capabilities" | | "org.freedesktop.Telepathy.Connection.Interface.Capabilities" | |
| | | | |
| #define TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES \ | | #define TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES \ | |
| (tp_iface_quark_connection_interface_capabilities ()) | | (tp_iface_quark_connection_interface_capabilities ()) | |
| | | | |
| GQuark tp_iface_quark_connection_interface_capabilities (void); | | GQuark tp_iface_quark_connection_interface_capabilities (void); | |
| | | | |
| #define TP_TOKEN_CONNECTION_INTERFACE_CAPABILITIES_CAPS \ | | #define TP_TOKEN_CONNECTION_INTERFACE_CAPABILITIES_CAPS \ | |
| "org.freedesktop.Telepathy.Connection.Interface.Capabilities/caps" | | "org.freedesktop.Telepathy.Connection.Interface.Capabilities/caps" | |
| | | | |
|
| | | #define TP_IFACE_CONNECTION_INTERFACE_CELLULAR \ | |
| | | "org.freedesktop.Telepathy.Connection.Interface.Cellular" | |
| | | | |
| | | #define TP_IFACE_QUARK_CONNECTION_INTERFACE_CELLULAR \ | |
| | | (tp_iface_quark_connection_interface_cellular ()) | |
| | | | |
| | | GQuark tp_iface_quark_connection_interface_cellular (void); | |
| | | | |
| | | #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_VALIDITY_PERIOD \ | |
| | | "org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageValidityPer | |
| | | iod" | |
| | | | |
| | | #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_SERVICE_CENTRE \ | |
| | | "org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageServiceCent | |
| | | re" | |
| | | | |
| | | #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_IMSI \ | |
| | | "org.freedesktop.Telepathy.Connection.Interface.Cellular.IMSI" | |
| | | | |
| | | #define TP_PROP_CONNECTION_INTERFACE_CELLULAR_MESSAGE_REDUCED_CHARACTER_SET | |
| | | \ | |
| | | "org.freedesktop.Telepathy.Connection.Interface.Cellular.MessageReducedChar | |
| | | acterSet" | |
| | | | |
| #define TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \ | | #define TP_IFACE_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \ | |
| "org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities" | | "org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities" | |
| | | | |
| #define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \ | | #define TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \ | |
| (tp_iface_quark_connection_interface_contact_capabilities ()) | | (tp_iface_quark_connection_interface_contact_capabilities ()) | |
| | | | |
| GQuark tp_iface_quark_connection_interface_contact_capabilities (void); | | GQuark tp_iface_quark_connection_interface_contact_capabilities (void); | |
| | | | |
| #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_CAPABILITIES \ | | #define TP_TOKEN_CONNECTION_INTERFACE_CONTACT_CAPABILITIES_CAPABILITIES \ | |
| "org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities/capabil
ities" | | "org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities/capabil
ities" | |
| | | | |
| skipping to change at line 665 | | skipping to change at line 688 | |
| | | | |
| #define TP_PROP_ACCOUNT_VALID \ | | #define TP_PROP_ACCOUNT_VALID \ | |
| "org.freedesktop.Telepathy.Account.Valid" | | "org.freedesktop.Telepathy.Account.Valid" | |
| | | | |
| #define TP_PROP_ACCOUNT_ENABLED \ | | #define TP_PROP_ACCOUNT_ENABLED \ | |
| "org.freedesktop.Telepathy.Account.Enabled" | | "org.freedesktop.Telepathy.Account.Enabled" | |
| | | | |
| #define TP_PROP_ACCOUNT_NICKNAME \ | | #define TP_PROP_ACCOUNT_NICKNAME \ | |
| "org.freedesktop.Telepathy.Account.Nickname" | | "org.freedesktop.Telepathy.Account.Nickname" | |
| | | | |
|
| | | #define TP_PROP_ACCOUNT_SERVICE \ | |
| | | "org.freedesktop.Telepathy.Account.Service" | |
| | | | |
| #define TP_PROP_ACCOUNT_PARAMETERS \ | | #define TP_PROP_ACCOUNT_PARAMETERS \ | |
| "org.freedesktop.Telepathy.Account.Parameters" | | "org.freedesktop.Telepathy.Account.Parameters" | |
| | | | |
| #define TP_PROP_ACCOUNT_AUTOMATIC_PRESENCE \ | | #define TP_PROP_ACCOUNT_AUTOMATIC_PRESENCE \ | |
| "org.freedesktop.Telepathy.Account.AutomaticPresence" | | "org.freedesktop.Telepathy.Account.AutomaticPresence" | |
| | | | |
| #define TP_PROP_ACCOUNT_CONNECT_AUTOMATICALLY \ | | #define TP_PROP_ACCOUNT_CONNECT_AUTOMATICALLY \ | |
| "org.freedesktop.Telepathy.Account.ConnectAutomatically" | | "org.freedesktop.Telepathy.Account.ConnectAutomatically" | |
| | | | |
| #define TP_PROP_ACCOUNT_CONNECTION \ | | #define TP_PROP_ACCOUNT_CONNECTION \ | |
| | | | |
| skipping to change at line 715 | | skipping to change at line 741 | |
| "org.freedesktop.Telepathy.Account.Interface.Avatar" | | "org.freedesktop.Telepathy.Account.Interface.Avatar" | |
| | | | |
| #define TP_IFACE_QUARK_ACCOUNT_INTERFACE_AVATAR \ | | #define TP_IFACE_QUARK_ACCOUNT_INTERFACE_AVATAR \ | |
| (tp_iface_quark_account_interface_avatar ()) | | (tp_iface_quark_account_interface_avatar ()) | |
| | | | |
| GQuark tp_iface_quark_account_interface_avatar (void); | | GQuark tp_iface_quark_account_interface_avatar (void); | |
| | | | |
| #define TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR \ | | #define TP_PROP_ACCOUNT_INTERFACE_AVATAR_AVATAR \ | |
| "org.freedesktop.Telepathy.Account.Interface.Avatar.Avatar" | | "org.freedesktop.Telepathy.Account.Interface.Avatar.Avatar" | |
| | | | |
|
| | | #define TP_IFACE_ACCOUNT_INTERFACE_STORAGE \ | |
| | | "org.freedesktop.Telepathy.Account.Interface.Storage" | |
| | | | |
| | | #define TP_IFACE_QUARK_ACCOUNT_INTERFACE_STORAGE \ | |
| | | (tp_iface_quark_account_interface_storage ()) | |
| | | | |
| | | GQuark tp_iface_quark_account_interface_storage (void); | |
| | | | |
| | | #define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_PROVIDER \ | |
| | | "org.freedesktop.Telepathy.Account.Interface.Storage.StorageProvider" | |
| | | | |
| | | #define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_IDENTIFIER \ | |
| | | "org.freedesktop.Telepathy.Account.Interface.Storage.StorageIdentifier" | |
| | | | |
| | | #define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_SPECIFIC_INFORMATION \ | |
| | | "org.freedesktop.Telepathy.Account.Interface.Storage.StorageSpecificInforma | |
| | | tion" | |
| | | | |
| | | #define TP_PROP_ACCOUNT_INTERFACE_STORAGE_STORAGE_RESTRICTIONS \ | |
| | | "org.freedesktop.Telepathy.Account.Interface.Storage.StorageRestrictions" | |
| | | | |
| #define TP_IFACE_CHANNEL_DISPATCHER \ | | #define TP_IFACE_CHANNEL_DISPATCHER \ | |
| "org.freedesktop.Telepathy.ChannelDispatcher" | | "org.freedesktop.Telepathy.ChannelDispatcher" | |
| | | | |
| #define TP_IFACE_QUARK_CHANNEL_DISPATCHER \ | | #define TP_IFACE_QUARK_CHANNEL_DISPATCHER \ | |
| (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" | |
| | | | |
End of changes. 4 change blocks. |
| 0 lines changed or deleted | | 51 lines changed or added | |
|
| tp-cli-connection.h | | tp-cli-connection.h | |
| | | | |
| skipping to change at line 659 | | skipping to change at line 659 | |
| | | | |
| #ifndef TP_DISABLE_DEPRECATED | | #ifndef TP_DISABLE_DEPRECATED | |
| gboolean tp_cli_connection_interface_capabilities_run_get_capabilities (TpC
onnection *proxy, | | gboolean tp_cli_connection_interface_capabilities_run_get_capabilities (TpC
onnection *proxy, | |
| gint timeout_ms, | | gint timeout_ms, | |
| const GArray *in_Handles, | | const GArray *in_Handles, | |
| GPtrArray **out_Contact_Capabilities, | | GPtrArray **out_Contact_Capabilities, | |
| 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_cellular_signal_callback_imsi_ch | |
| | | anged) (TpConnection *proxy, | |
| | | const gchar *arg_IMSI, | |
| | | gpointer user_data, GObject *weak_object); | |
| | | TpProxySignalConnection *tp_cli_connection_interface_cellular_connect_to_im | |
| | | si_changed (TpConnection *proxy, | |
| | | tp_cli_connection_interface_cellular_signal_callback_imsi_changed callb | |
| | | ack, | |
| | | gpointer user_data, | |
| | | GDestroyNotify destroy, | |
| | | GObject *weak_object, | |
| | | GError **error); | |
| | | | |
| typedef void (*tp_cli_connection_interface_contact_capabilities_signal_call
back_contact_capabilities_changed) (TpConnection *proxy, | | typedef void (*tp_cli_connection_interface_contact_capabilities_signal_call
back_contact_capabilities_changed) (TpConnection *proxy, | |
| GHashTable *arg_caps, | | GHashTable *arg_caps, | |
| gpointer user_data, GObject *weak_object); | | gpointer user_data, GObject *weak_object); | |
| TpProxySignalConnection *tp_cli_connection_interface_contact_capabilities_c
onnect_to_contact_capabilities_changed (TpConnection *proxy, | | TpProxySignalConnection *tp_cli_connection_interface_contact_capabilities_c
onnect_to_contact_capabilities_changed (TpConnection *proxy, | |
| tp_cli_connection_interface_contact_capabilities_signal_callback_contac
t_capabilities_changed callback, | | tp_cli_connection_interface_contact_capabilities_signal_callback_contac
t_capabilities_changed 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 | | 13 lines changed or added | |
|
| tp-svc-account.h | | tp-svc-account.h | |
| | | | |
| skipping to change at line 82 | | skipping to change at line 82 | |
| (tp_svc_account_interface_avatar_get_type ()) | | (tp_svc_account_interface_avatar_get_type ()) | |
| #define TP_SVC_ACCOUNT_INTERFACE_AVATAR(obj) \ | | #define TP_SVC_ACCOUNT_INTERFACE_AVATAR(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR,
TpSvcAccountInterfaceAvatar)) | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR,
TpSvcAccountInterfaceAvatar)) | |
| #define TP_IS_SVC_ACCOUNT_INTERFACE_AVATAR(obj) \ | | #define TP_IS_SVC_ACCOUNT_INTERFACE_AVATAR(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR)) | | (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATAR)) | |
| #define TP_SVC_ACCOUNT_INTERFACE_AVATAR_GET_CLASS(obj) \ | | #define TP_SVC_ACCOUNT_INTERFACE_AVATAR_GET_CLASS(obj) \ | |
| (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATA
R, TpSvcAccountInterfaceAvatarClass)) | | (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_ACCOUNT_INTERFACE_AVATA
R, TpSvcAccountInterfaceAvatarClass)) | |
| | | | |
| void tp_svc_account_interface_avatar_emit_avatar_changed (gpointer instance
); | | void tp_svc_account_interface_avatar_emit_avatar_changed (gpointer instance
); | |
| | | | |
|
| | | typedef struct _TpSvcAccountInterfaceStorage TpSvcAccountInterfaceStorage; | |
| | | | |
| | | typedef struct _TpSvcAccountInterfaceStorageClass TpSvcAccountInterfaceStor | |
| | | ageClass; | |
| | | | |
| | | GType tp_svc_account_interface_storage_get_type (void); | |
| | | #define TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE \ | |
| | | (tp_svc_account_interface_storage_get_type ()) | |
| | | #define TP_SVC_ACCOUNT_INTERFACE_STORAGE(obj) \ | |
| | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE, | |
| | | TpSvcAccountInterfaceStorage)) | |
| | | #define TP_IS_SVC_ACCOUNT_INTERFACE_STORAGE(obj) \ | |
| | | (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_ACCOUNT_INTERFACE_STORAGE) | |
| | | ) | |
| | | #define TP_SVC_ACCOUNT_INTERFACE_STORAGE_GET_CLASS(obj) \ | |
| | | (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_ACCOUNT_INTERFACE_STORA | |
| | | GE, TpSvcAccountInterfaceStorageClass)) | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 18 lines changed or added | |
|
| tp-svc-connection.h | | tp-svc-connection.h | |
| | | | |
| skipping to change at line 523 | | skipping to change at line 523 | |
| tp_svc_connection_interface_capabilities_return_from_get_capabilities (DBus
GMethodInvocation *context, | | tp_svc_connection_interface_capabilities_return_from_get_capabilities (DBus
GMethodInvocation *context, | |
| const GPtrArray *out_Contact_Capabilities) | | const GPtrArray *out_Contact_Capabilities) | |
| { | | { | |
| dbus_g_method_return (context, | | dbus_g_method_return (context, | |
| out_Contact_Capabilities); | | out_Contact_Capabilities); | |
| } | | } | |
| | | | |
| void tp_svc_connection_interface_capabilities_emit_capabilities_changed (gp
ointer instance, | | void tp_svc_connection_interface_capabilities_emit_capabilities_changed (gp
ointer instance, | |
| const GPtrArray *arg_Caps); | | const GPtrArray *arg_Caps); | |
| | | | |
|
| | | typedef struct _TpSvcConnectionInterfaceCellular TpSvcConnectionInterfaceCe | |
| | | llular; | |
| | | | |
| | | typedef struct _TpSvcConnectionInterfaceCellularClass TpSvcConnectionInterf | |
| | | aceCellularClass; | |
| | | | |
| | | GType tp_svc_connection_interface_cellular_get_type (void); | |
| | | #define TP_TYPE_SVC_CONNECTION_INTERFACE_CELLULAR \ | |
| | | (tp_svc_connection_interface_cellular_get_type ()) | |
| | | #define TP_SVC_CONNECTION_INTERFACE_CELLULAR(obj) \ | |
| | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CELLU | |
| | | LAR, TpSvcConnectionInterfaceCellular)) | |
| | | #define TP_IS_SVC_CONNECTION_INTERFACE_CELLULAR(obj) \ | |
| | | (G_TYPE_CHECK_INSTANCE_TYPE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CELLU | |
| | | LAR)) | |
| | | #define TP_SVC_CONNECTION_INTERFACE_CELLULAR_GET_CLASS(obj) \ | |
| | | (G_TYPE_INSTANCE_GET_INTERFACE((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CE | |
| | | LLULAR, TpSvcConnectionInterfaceCellularClass)) | |
| | | | |
| | | void tp_svc_connection_interface_cellular_emit_imsi_changed (gpointer insta | |
| | | nce, | |
| | | const gchar *arg_IMSI); | |
| | | | |
| typedef struct _TpSvcConnectionInterfaceContactCapabilities TpSvcConnection
InterfaceContactCapabilities; | | typedef struct _TpSvcConnectionInterfaceContactCapabilities TpSvcConnection
InterfaceContactCapabilities; | |
| | | | |
| typedef struct _TpSvcConnectionInterfaceContactCapabilitiesClass TpSvcConne
ctionInterfaceContactCapabilitiesClass; | | typedef struct _TpSvcConnectionInterfaceContactCapabilitiesClass TpSvcConne
ctionInterfaceContactCapabilitiesClass; | |
| | | | |
| GType tp_svc_connection_interface_contact_capabilities_get_type (void); | | GType tp_svc_connection_interface_contact_capabilities_get_type (void); | |
| #define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \ | | #define TP_TYPE_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES \ | |
| (tp_svc_connection_interface_contact_capabilities_get_type ()) | | (tp_svc_connection_interface_contact_capabilities_get_type ()) | |
| #define TP_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES(obj) \ | | #define TP_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA
CT_CAPABILITIES, TpSvcConnectionInterfaceContactCapabilities)) | | (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_SVC_CONNECTION_INTERFACE_CONTA
CT_CAPABILITIES, TpSvcConnectionInterfaceContactCapabilities)) | |
| #define TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES(obj) \ | | #define TP_IS_SVC_CONNECTION_INTERFACE_CONTACT_CAPABILITIES(obj) \ | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 23 lines changed or added | |
|
| util.h | | util.h | |
| | | | |
| skipping to change at line 26 | | skipping to change at line 26 | |
| * | | * | |
| * You should have received a copy of the GNU Lesser General Public | | * You should have received a copy of the GNU Lesser General Public | |
| * License along with this library; if not, write to the Free Software | | * License along with this library; if not, write to the Free Software | |
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
SA | | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U
SA | |
| */ | | */ | |
| | | | |
| #ifndef __TP_UTIL_H__ | | #ifndef __TP_UTIL_H__ | |
| #define __TP_UTIL_H__ | | #define __TP_UTIL_H__ | |
| #define __TP_IN_UTIL_H__ | | #define __TP_IN_UTIL_H__ | |
| | | | |
|
| #include <glib-object.h> | | #include <gio/gio.h> | |
| | | | |
| #include <telepathy-glib/verify.h> | | #include <telepathy-glib/verify.h> | |
| | | | |
| #define tp_verify_statement(R) ((void) tp_verify_true (R)) | | #define tp_verify_statement(R) ((void) tp_verify_true (R)) | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
| gboolean tp_g_ptr_array_contains (GPtrArray *haystack, gpointer needle); | | gboolean tp_g_ptr_array_contains (GPtrArray *haystack, gpointer needle); | |
| | | | |
| GValue *tp_g_value_slice_new (GType type) G_GNUC_WARN_UNUSED_RESULT; | | GValue *tp_g_value_slice_new (GType type) G_GNUC_WARN_UNUSED_RESULT; | |
| | | | |
| skipping to change at line 141 | | skipping to change at line 141 | |
| gpointer _tp_clear_boxed_tmp = *(pp); \ | | gpointer _tp_clear_boxed_tmp = *(pp); \ | |
| \ | | \ | |
| *(pp) = NULL; \ | | *(pp) = NULL; \ | |
| \ | | \ | |
| if (_tp_clear_boxed_tmp != NULL) \ | | if (_tp_clear_boxed_tmp != NULL) \ | |
| g_boxed_free (gtype, _tp_clear_boxed_tmp); \ | | g_boxed_free (gtype, _tp_clear_boxed_tmp); \ | |
| } \ | | } \ | |
| } \ | | } \ | |
| G_STMT_END | | G_STMT_END | |
| | | | |
|
| | | void tp_simple_async_report_success_in_idle (GObject *source, | |
| | | GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag); | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| #undef __TP_IN_UTIL_H__ | | #undef __TP_IN_UTIL_H__ | |
| #endif /* __TP_UTIL_H__ */ | | #endif /* __TP_UTIL_H__ */ | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 4 lines changed or added | |
|