| base-client.h | | base-client.h | |
| | | | |
| skipping to change at line 28 | | skipping to change at line 28 | |
| * 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_BASE_CLIENT_H__ | | #ifndef __TP_BASE_CLIENT_H__ | |
| #define __TP_BASE_CLIENT_H__ | | #define __TP_BASE_CLIENT_H__ | |
| | | | |
| #include <dbus/dbus-glib.h> | | #include <dbus/dbus-glib.h> | |
| #include <glib-object.h> | | #include <glib-object.h> | |
| | | | |
| #include <telepathy-glib/account.h> | | #include <telepathy-glib/account.h> | |
|
| | | #include <telepathy-glib/account-manager.h> | |
| #include <telepathy-glib/add-dispatch-operation-context.h> | | #include <telepathy-glib/add-dispatch-operation-context.h> | |
| #include <telepathy-glib/handle-channels-context.h> | | #include <telepathy-glib/handle-channels-context.h> | |
| #include <telepathy-glib/observe-channels-context.h> | | #include <telepathy-glib/observe-channels-context.h> | |
| #include <telepathy-glib/channel-dispatch-operation.h> | | #include <telepathy-glib/channel-dispatch-operation.h> | |
| #include <telepathy-glib/connection.h> | | #include <telepathy-glib/connection.h> | |
| #include <telepathy-glib/dbus.h> | | #include <telepathy-glib/dbus.h> | |
| #include <telepathy-glib/defs.h> | | #include <telepathy-glib/defs.h> | |
| #include <telepathy-glib/dbus-properties-mixin.h> | | #include <telepathy-glib/dbus-properties-mixin.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
| skipping to change at line 135 | | skipping to change at line 136 | |
| | | | |
| void tp_base_client_set_handler_request_notification (TpBaseClient *self); | | void tp_base_client_set_handler_request_notification (TpBaseClient *self); | |
| | | | |
| void tp_base_client_add_handler_capability (TpBaseClient *self, | | void tp_base_client_add_handler_capability (TpBaseClient *self, | |
| const gchar *token); | | const gchar *token); | |
| void tp_base_client_add_handler_capabilities (TpBaseClient *self, | | void tp_base_client_add_handler_capabilities (TpBaseClient *self, | |
| const gchar * const *tokens); | | const gchar * const *tokens); | |
| void tp_base_client_add_handler_capabilities_varargs (TpBaseClient *self, | | void tp_base_client_add_handler_capabilities_varargs (TpBaseClient *self, | |
| const gchar *first_token, ...) G_GNUC_NULL_TERMINATED; | | const gchar *first_token, ...) G_GNUC_NULL_TERMINATED; | |
| | | | |
|
| | | void tp_base_client_add_account_features (TpBaseClient *self, | |
| | | const GQuark *features, gssize n); | |
| | | void tp_base_client_add_account_features_varargs (TpBaseClient *self, | |
| | | GQuark feature, ...); | |
| | | | |
| | | void tp_base_client_add_channel_features (TpBaseClient *self, | |
| | | const GQuark *features, gssize n); | |
| | | void tp_base_client_add_channel_features_varargs (TpBaseClient *self, | |
| | | GQuark feature, ...); | |
| | | | |
| | | void tp_base_client_add_connection_features (TpBaseClient *self, | |
| | | const GQuark *features, gssize n); | |
| | | void tp_base_client_add_connection_features_varargs (TpBaseClient *self, | |
| | | GQuark feature, ...); | |
| | | | |
| /* future, potentially (currently in spec as a draft): | | /* future, potentially (currently in spec as a draft): | |
| void tp_base_client_set_handler_related_conferences_bypass_approval ( | | void tp_base_client_set_handler_related_conferences_bypass_approval ( | |
| TpBaseClient *self, gboolean bypass_approval); | | TpBaseClient *self, gboolean bypass_approval); | |
| */ | | */ | |
| | | | |
| gboolean tp_base_client_register (TpBaseClient *self, | | gboolean tp_base_client_register (TpBaseClient *self, | |
| GError **error); | | GError **error); | |
| | | | |
| /* Normal methods, can be called at any time */ | | /* Normal methods, can be called at any time */ | |
| | | | |
| GList *tp_base_client_get_pending_requests (TpBaseClient *self); | | GList *tp_base_client_get_pending_requests (TpBaseClient *self); | |
| GList *tp_base_client_get_handled_channels (TpBaseClient *self); | | GList *tp_base_client_get_handled_channels (TpBaseClient *self); | |
| | | | |
| const gchar *tp_base_client_get_name (TpBaseClient *self); | | const gchar *tp_base_client_get_name (TpBaseClient *self); | |
| gboolean tp_base_client_get_uniquify_name (TpBaseClient *self); | | gboolean tp_base_client_get_uniquify_name (TpBaseClient *self); | |
| const gchar *tp_base_client_get_bus_name (TpBaseClient *self); | | const gchar *tp_base_client_get_bus_name (TpBaseClient *self); | |
| const gchar *tp_base_client_get_object_path (TpBaseClient *self); | | const gchar *tp_base_client_get_object_path (TpBaseClient *self); | |
| TpDBusDaemon *tp_base_client_get_dbus_daemon (TpBaseClient *self); | | TpDBusDaemon *tp_base_client_get_dbus_daemon (TpBaseClient *self); | |
|
| | | TpAccountManager *tp_base_client_get_account_manager (TpBaseClient *self); | |
| | | | |
| void tp_base_client_unregister (TpBaseClient *self); | | void tp_base_client_unregister (TpBaseClient *self); | |
| | | | |
| #define TP_TYPE_BASE_CLIENT \ | | #define TP_TYPE_BASE_CLIENT \ | |
| (tp_base_client_get_type ()) | | (tp_base_client_get_type ()) | |
| #define TP_BASE_CLIENT(obj) \ | | #define TP_BASE_CLIENT(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_BASE_CLIENT, \ | | (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_BASE_CLIENT, \ | |
| TpBaseClient)) | | TpBaseClient)) | |
| #define TP_BASE_CLIENT_CLASS(klass) \ | | #define TP_BASE_CLIENT_CLASS(klass) \ | |
| (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASE_CLIENT, \ | | (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_BASE_CLIENT, \ | |
| | | | |
End of changes. 3 change blocks. |
| 0 lines changed or deleted | | 17 lines changed or added | |
|
| channel-factory-iface.h | | channel-factory-iface.h | |
| | | | |
| skipping to change at line 175 | | skipping to change at line 175 | |
| * @parent_class: Fields shared with GTypeInterface | | * @parent_class: Fields shared with GTypeInterface | |
| * @close_all: Close all channels and shut down the channel factory. It is
not | | * @close_all: Close all channels and shut down the channel factory. It is
not | |
| * expected to be usable afterwards. This is called when the connection go
es | | * expected to be usable afterwards. This is called when the connection go
es | |
| * to disconnected state, before emitting the StatusChanged signal or call
ing | | * to disconnected state, before emitting the StatusChanged signal or call
ing | |
| * disconnected(). Must be filled in by implementations. | | * disconnected(). Must be filled in by implementations. | |
| * @connecting: Called just after the connection goes from disconnected to | | * @connecting: Called just after the connection goes from disconnected to | |
| * connecting state. May be NULL if nothing special needs to happen. | | * connecting state. May be NULL if nothing special needs to happen. | |
| * @connected: Called just after the connection goes from connecting to | | * @connected: Called just after the connection goes from connecting to | |
| * connected state. May be NULL if nothing special needs to happen. | | * connected state. May be NULL if nothing special needs to happen. | |
| * @disconnected: Called just after the connection goes to disconnected sta
te. | | * @disconnected: Called just after the connection goes to disconnected sta
te. | |
|
| * This is always called after close_all(). May be NULL if nothing special | | * This is always called after @close_all. May be NULL if nothing special | |
| * needs to happen. | | * needs to happen. | |
| * @foreach: Call func(channel, data) for each channel managed by this | | * @foreach: Call func(channel, data) for each channel managed by this | |
| * factory. Must be filled in by implementations. | | * factory. Must be filled in by implementations. | |
| * @request: Respond to a request for a channel. Must be filled in by | | * @request: Respond to a request for a channel. Must be filled in by | |
| * implementations. See #TpChannelFactoryIfaceRequestImpl for details. | | * implementations. See #TpChannelFactoryIfaceRequestImpl for details. | |
| * | | * | |
| * The class structure and vtable for a channel factory implementation. | | * The class structure and vtable for a channel factory implementation. | |
| * | | * | |
| * Deprecated since version 0.11.7. Use #TpChannelManager instead. | | * Deprecated since version 0.11.7. Use #TpChannelManager instead. | |
| * | | * | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| contact.h | | contact.h | |
| | | | |
| skipping to change at line 65 | | skipping to change at line 65 | |
| TpContactClass)) | | TpContactClass)) | |
| | | | |
| typedef enum { | | typedef enum { | |
| TP_CONTACT_FEATURE_ALIAS, | | TP_CONTACT_FEATURE_ALIAS, | |
| TP_CONTACT_FEATURE_AVATAR_TOKEN, | | TP_CONTACT_FEATURE_AVATAR_TOKEN, | |
| TP_CONTACT_FEATURE_PRESENCE, | | TP_CONTACT_FEATURE_PRESENCE, | |
| TP_CONTACT_FEATURE_LOCATION, | | TP_CONTACT_FEATURE_LOCATION, | |
| TP_CONTACT_FEATURE_CAPABILITIES, | | TP_CONTACT_FEATURE_CAPABILITIES, | |
| TP_CONTACT_FEATURE_AVATAR_DATA, | | TP_CONTACT_FEATURE_AVATAR_DATA, | |
| TP_CONTACT_FEATURE_CONTACT_INFO, | | TP_CONTACT_FEATURE_CONTACT_INFO, | |
|
| #define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_INFO + 1) | | | |
| } TpContactFeature; | | } TpContactFeature; | |
|
| | | #define NUM_TP_CONTACT_FEATURES (TP_CONTACT_FEATURE_CONTACT_INFO + 1) | |
| | | | |
| /* Basic functionality, always available */ | | /* Basic functionality, always available */ | |
| TpConnection *tp_contact_get_connection (TpContact *self); | | TpConnection *tp_contact_get_connection (TpContact *self); | |
| TpHandle tp_contact_get_handle (TpContact *self); | | TpHandle tp_contact_get_handle (TpContact *self); | |
| const gchar *tp_contact_get_identifier (TpContact *self); | | const gchar *tp_contact_get_identifier (TpContact *self); | |
| gboolean tp_contact_has_feature (TpContact *self, TpContactFeature feature)
; | | gboolean tp_contact_has_feature (TpContact *self, TpContactFeature feature)
; | |
| | | | |
| /* TP_CONTACT_FEATURE_ALIAS */ | | /* TP_CONTACT_FEATURE_ALIAS */ | |
| const gchar *tp_contact_get_alias (TpContact *self); | | const gchar *tp_contact_get_alias (TpContact *self); | |
| | | | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| handle-repo-static.h | | handle-repo-static.h | |
| | | | |
| skipping to change at line 49 | | skipping to change at line 49 | |
| * valid handle names. All of these are preallocated; no more may be | | * valid handle names. All of these are preallocated; no more may be | |
| * created, and attempts to do so will fail. | | * created, and attempts to do so will fail. | |
| * | | * | |
| * Handles in this repository are 1 more than the index in the string | | * Handles in this repository are 1 more than the index in the string | |
| * vector of the handle's name, so the first name in the vector has | | * vector of the handle's name, so the first name in the vector has | |
| * handle 1 and so on. Connection managers which use a static repository | | * handle 1 and so on. Connection managers which use a static repository | |
| * may assume this to be true, and use an enumeration starting at 1, in the | | * may assume this to be true, and use an enumeration starting at 1, in the | |
| * same order as the string vector, to avoid having to look up handles | | * same order as the string vector, to avoid having to look up handles | |
| * internally. | | * internally. | |
| * | | * | |
|
| * This is intended for handles of type %TP_HANDLE_TYPE_CONTACT_LIST, | | * This is intended for handles of type %TP_HANDLE_TYPE_LIST, | |
| * for which the connection manager should only accept a static list of | | * for which the connection manager should only accept a static list of | |
| * supported handle names. | | * supported handle names. | |
| * | | * | |
| * All structure fields are private. | | * All structure fields are private. | |
| */ | | */ | |
| | | | |
| typedef struct _TpStaticHandleRepo TpStaticHandleRepo; | | typedef struct _TpStaticHandleRepo TpStaticHandleRepo; | |
| | | | |
| /** | | /** | |
| * TpStaticHandleRepoClass: | | * TpStaticHandleRepoClass: | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| proxy.h | | proxy.h | |
| | | | |
| skipping to change at line 55 | | skipping to change at line 55 | |
| TP_DBUS_ERROR_PROXY_UNREFERENCED = 1, | | TP_DBUS_ERROR_PROXY_UNREFERENCED = 1, | |
| TP_DBUS_ERROR_NO_INTERFACE = 2, | | TP_DBUS_ERROR_NO_INTERFACE = 2, | |
| TP_DBUS_ERROR_NAME_OWNER_LOST = 3, | | TP_DBUS_ERROR_NAME_OWNER_LOST = 3, | |
| TP_DBUS_ERROR_INVALID_BUS_NAME = 4, | | TP_DBUS_ERROR_INVALID_BUS_NAME = 4, | |
| TP_DBUS_ERROR_INVALID_INTERFACE_NAME = 5, | | TP_DBUS_ERROR_INVALID_INTERFACE_NAME = 5, | |
| TP_DBUS_ERROR_INVALID_OBJECT_PATH = 6, | | TP_DBUS_ERROR_INVALID_OBJECT_PATH = 6, | |
| TP_DBUS_ERROR_INVALID_MEMBER_NAME = 7, | | TP_DBUS_ERROR_INVALID_MEMBER_NAME = 7, | |
| TP_DBUS_ERROR_OBJECT_REMOVED = 8, | | TP_DBUS_ERROR_OBJECT_REMOVED = 8, | |
| TP_DBUS_ERROR_CANCELLED = 9, | | TP_DBUS_ERROR_CANCELLED = 9, | |
| TP_DBUS_ERROR_INCONSISTENT = 10, | | TP_DBUS_ERROR_INCONSISTENT = 10, | |
|
| #define NUM_TP_DBUS_ERRORS (TP_DBUS_ERROR_INCONSISTENT + 1) | | | |
| } TpDBusError; | | } TpDBusError; | |
|
| | | #define NUM_TP_DBUS_ERRORS (TP_DBUS_ERROR_INCONSISTENT + 1) | |
| | | | |
| struct _TpProxy { | | struct _TpProxy { | |
| /*<private>*/ | | /*<private>*/ | |
| GObject parent; | | GObject parent; | |
| | | | |
| TpDBusDaemon *dbus_daemon; | | TpDBusDaemon *dbus_daemon; | |
| DBusGConnection *dbus_connection; | | DBusGConnection *dbus_connection; | |
| gchar *bus_name; | | gchar *bus_name; | |
| gchar *object_path; | | gchar *object_path; | |
| | | | |
| | | | |
End of changes. 2 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|