| tp-chan.h | tp-chan.h | |||
|---|---|---|---|---|
| skipping to change at line 72 | skipping to change at line 72 | |||
| #define TELEPATHY_CHAN_IFACE_CONTACTSEARCH_QUARK (tp_get_chan_contactsearch _interface()) | #define TELEPATHY_CHAN_IFACE_CONTACTSEARCH_QUARK (tp_get_chan_contactsearch _interface()) | |||
| #endif | #endif | |||
| #define TELEPATHY_CHAN_IFACE_STREAMED_QUARK (tp_get_chan_streamed_interface ()) | #define TELEPATHY_CHAN_IFACE_STREAMED_QUARK (tp_get_chan_streamed_interface ()) | |||
| #define TELEPATHY_CHAN_IFACE_ROOMLIST_QUARK (tp_get_chan_roomlist_interface ()) | #define TELEPATHY_CHAN_IFACE_ROOMLIST_QUARK (tp_get_chan_roomlist_interface ()) | |||
| #define TELEPATHY_CHAN_IFACE_TEXT_QUARK (tp_get_chan_text_interface()) | #define TELEPATHY_CHAN_IFACE_TEXT_QUARK (tp_get_chan_text_interface()) | |||
| #define TELEPATHY_CHAN_IFACE_DTMF_QUARK (tp_get_chan_dtmf_interface()) | #define TELEPATHY_CHAN_IFACE_DTMF_QUARK (tp_get_chan_dtmf_interface()) | |||
| #define TELEPATHY_CHAN_IFACE_GROUP_QUARK (tp_get_chan_group_interface()) | #define TELEPATHY_CHAN_IFACE_GROUP_QUARK (tp_get_chan_group_interface()) | |||
| #define TELEPATHY_CHAN_IFACE_HOLD_QUARK (tp_get_chan_hold_interface()) | #define TELEPATHY_CHAN_IFACE_HOLD_QUARK (tp_get_chan_hold_interface()) | |||
| #define TELEPATHY_CHAN_IFACE_PASSWORD_QUARK (tp_get_chan_password_interface ()) | #define TELEPATHY_CHAN_IFACE_PASSWORD_QUARK (tp_get_chan_password_interface ()) | |||
| #define TELEPATHY_CHAN_IFACE_TRANSFER_QUARK (tp_get_chan_transfer_interface ()) | #define TELEPATHY_CHAN_IFACE_TRANSFER_QUARK (tp_get_chan_transfer_interface ()) | |||
| #define TELEPATHY_CHAN_IFACE_ICE_SIGNALLING_QUARK (tp_get_chan_ice_signalli ng_interface()) | ||||
| /* The signal name for the synthesized Closed signal */ | /* The signal name for the synthesized Closed signal */ | |||
| #define TP_IFACE_CHAN_SIGNAL_CLOSED_SYNTHESIZED \ | #define TP_IFACE_CHAN_SIGNAL_CLOSED_SYNTHESIZED \ | |||
| "received::org-freedesktop-Telepathy-Channel-Closed" | "received::org-freedesktop-Telepathy-Channel-Closed" | |||
| typedef struct _tp_chan TpChan; | typedef struct _tp_chan TpChan; | |||
| typedef struct _tp_chanclass TpChanClass; | typedef struct _tp_chanclass TpChanClass; | |||
| struct _tp_chan | struct _tp_chan | |||
| { | { | |||
| skipping to change at line 156 | skipping to change at line 157 | |||
| GQuark tp_get_chan_contactsearch_interface(void); | GQuark tp_get_chan_contactsearch_interface(void); | |||
| #endif | #endif | |||
| GQuark tp_get_chan_streamed_interface(void); | GQuark tp_get_chan_streamed_interface(void); | |||
| GQuark tp_get_chan_roomlist_interface(void); | GQuark tp_get_chan_roomlist_interface(void); | |||
| GQuark tp_get_chan_text_interface(void); | GQuark tp_get_chan_text_interface(void); | |||
| GQuark tp_get_chan_dtmf_interface(void); | GQuark tp_get_chan_dtmf_interface(void); | |||
| GQuark tp_get_chan_group_interface(void); | GQuark tp_get_chan_group_interface(void); | |||
| GQuark tp_get_chan_hold_interface(void); | GQuark tp_get_chan_hold_interface(void); | |||
| GQuark tp_get_chan_password_interface(void); | GQuark tp_get_chan_password_interface(void); | |||
| GQuark tp_get_chan_transfer_interface(void); | GQuark tp_get_chan_transfer_interface(void); | |||
| GQuark tp_get_chan_ice_signalling_interface(void); | ||||
| #endif | #endif | |||
| End of changes. 2 change blocks. | ||||
| 0 lines changed or deleted | 2 lines changed or added | |||
| tp-interfaces.h | tp-interfaces.h | |||
|---|---|---|---|---|
| skipping to change at line 42 | skipping to change at line 42 | |||
| #define TP_IFACE_CHANNEL_INTERFACE_GROUP \ | #define TP_IFACE_CHANNEL_INTERFACE_GROUP \ | |||
| "org.freedesktop.Telepathy.Channel.Interface.Group" | "org.freedesktop.Telepathy.Channel.Interface.Group" | |||
| #define TP_IFACE_CHANNEL_INTERFACE_HOLD \ | #define TP_IFACE_CHANNEL_INTERFACE_HOLD \ | |||
| "org.freedesktop.Telepathy.Channel.Interface.Hold" | "org.freedesktop.Telepathy.Channel.Interface.Hold" | |||
| #define TP_IFACE_CHANNEL_INTERFACE_PASSWORD \ | #define TP_IFACE_CHANNEL_INTERFACE_PASSWORD \ | |||
| "org.freedesktop.Telepathy.Channel.Interface.Password" | "org.freedesktop.Telepathy.Channel.Interface.Password" | |||
| #define TP_IFACE_CHANNEL_INTERFACE_SUBJECT \ | #define TP_IFACE_CHANNEL_INTERFACE_SUBJECT \ | |||
| "org.freedesktop.Telepathy.Channel.Interface.Subject" | "org.freedesktop.Telepathy.Channel.Interface.Subject" | |||
| #define TP_IFACE_CHANNEL_INTERFACE_TRANSFER \ | #define TP_IFACE_CHANNEL_INTERFACE_TRANSFER \ | |||
| "org.freedesktop.Telepathy.Channel.Interface.Transfer" | "org.freedesktop.Telepathy.Channel.Interface.Transfer" | |||
| #define TP_IFACE_CHANNEL_INTERFACE_ICE_SIGNALLING \ | ||||
| "org.freedesktop.Telepathy.Channel.Interface.IceSignalling" | ||||
| #define TP_IFACE_CHANNEL_TYPE_CONTACT_LIST \ | #define TP_IFACE_CHANNEL_TYPE_CONTACT_LIST \ | |||
| "org.freedesktop.Telepathy.Channel.Type.ContactList" | "org.freedesktop.Telepathy.Channel.Type.ContactList" | |||
| #if 0 | #if 0 | |||
| #define TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH \ | #define TP_IFACE_CHANNEL_TYPE_CONTACT_SEARCH \ | |||
| "org.freedesktop.Telepathy.Channel.Type.ContactSearch" | "org.freedesktop.Telepathy.Channel.Type.ContactSearch" | |||
| #endif | #endif | |||
| #define TP_IFACE_CHANNEL_TYPE_ROOM_LIST \ | #define TP_IFACE_CHANNEL_TYPE_ROOM_LIST \ | |||
| "org.freedesktop.Telepathy.Channel.Type.RoomList" | "org.freedesktop.Telepathy.Channel.Type.RoomList" | |||
| #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" | |||
| skipping to change at line 72 | skipping to change at line 75 | |||
| #define TP_IFACE_CONN_INTERFACE_FORWARDING \ | #define TP_IFACE_CONN_INTERFACE_FORWARDING \ | |||
| "org.freedesktop.Telepathy.Connection.Interface.Forwarding" | "org.freedesktop.Telepathy.Connection.Interface.Forwarding" | |||
| #define TP_IFACE_CONN_INTERFACE_PRESENCE \ | #define TP_IFACE_CONN_INTERFACE_PRESENCE \ | |||
| "org.freedesktop.Telepathy.Connection.Interface.Presence" | "org.freedesktop.Telepathy.Connection.Interface.Presence" | |||
| #define TP_IFACE_CONN_INTERFACE_PRIVACY \ | #define TP_IFACE_CONN_INTERFACE_PRIVACY \ | |||
| "org.freedesktop.Telepathy.Connection.Interface.Privacy" | "org.freedesktop.Telepathy.Connection.Interface.Privacy" | |||
| #define TP_IFACE_CONN_INTERFACE_RENAMING \ | #define TP_IFACE_CONN_INTERFACE_RENAMING \ | |||
| "org.freedesktop.Telepathy.Connection.Interface.Renaming" | "org.freedesktop.Telepathy.Connection.Interface.Renaming" | |||
| #define TP_IFACE_CONN_MGR_INTERFACE \ | #define TP_IFACE_CONN_MGR_INTERFACE \ | |||
| "org.freedesktop.Telepathy.ConnectionManager" | "org.freedesktop.Telepathy.ConnectionManager" | |||
| #define TP_IFACE_MEDIA_SESSION_HANDLER \ | #define TP_IFACE_ICE_SESSION_HANDLER \ | |||
| "org.freedesktop.Telepathy.Media.SessionHandler" | "org.freedesktop.Telepathy.Ice.SessionHandler" | |||
| #define TP_IFACE_MEDIA_STREAM_HANDLER \ | #define TP_IFACE_ICE_STREAM_HANDLER \ | |||
| "org.freedesktop.Telepathy.Media.StreamHandler" | "org.freedesktop.Telepathy.Ice.StreamHandler" | |||
| #define TP_IFACE_PROPERTIES \ | #define TP_IFACE_PROPERTIES \ | |||
| "org.freedesktop.Telepathy.Properties" | "org.freedesktop.Telepathy.Properties" | |||
| G_END_DECLS | G_END_DECLS | |||
| #endif /* #ifndef __TELEPATHY_INTERFACES_H__*/ | #endif /* #ifndef __TELEPATHY_INTERFACES_H__*/ | |||
| End of changes. 2 change blocks. | ||||
| 4 lines changed or deleted | 7 lines changed or added | |||