| base-channel.h | | base-channel.h | |
| | | | |
| skipping to change at line 59 | | skipping to change at line 59 | |
| struct _TpBaseChannelClass | | struct _TpBaseChannelClass | |
| { | | { | |
| /*< private >*/ | | /*< private >*/ | |
| GObjectClass parent_class; | | GObjectClass parent_class; | |
| | | | |
| /*< public >*/ | | /*< public >*/ | |
| TpDBusPropertiesMixinClass dbus_props_class; | | TpDBusPropertiesMixinClass dbus_props_class; | |
| | | | |
| const gchar *channel_type; | | const gchar *channel_type; | |
| TpHandleType target_handle_type; | | TpHandleType target_handle_type; | |
|
| const gchar **interfaces; | | const gchar **_TP_SEAL (interfaces); | |
| | | | |
| TpBaseChannelCloseFunc close; | | TpBaseChannelCloseFunc close; | |
| TpBaseChannelFillPropertiesFunc fill_immutable_properties; | | TpBaseChannelFillPropertiesFunc fill_immutable_properties; | |
| TpBaseChannelGetPathFunc get_object_path_suffix; | | TpBaseChannelGetPathFunc get_object_path_suffix; | |
| TpBaseChannelGetInterfacesFunc get_interfaces; | | TpBaseChannelGetInterfacesFunc get_interfaces; | |
| | | | |
| /*< private >*/ | | /*< private >*/ | |
| GCallback _reserved[9]; | | GCallback _reserved[9]; | |
| }; | | }; | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| base-connection-manager.h | | base-connection-manager.h | |
| | | | |
| skipping to change at line 70 | | skipping to change at line 70 | |
| TpBaseConnectionManagerClassPrivate; | | TpBaseConnectionManagerClassPrivate; | |
| | | | |
| typedef TpBaseConnection *(*TpBaseConnectionManagerNewConnFunc)( | | typedef TpBaseConnection *(*TpBaseConnectionManagerNewConnFunc)( | |
| TpBaseConnectionManager *self, const gchar *proto, | | TpBaseConnectionManager *self, const gchar *proto, | |
| TpIntset *params_present, void *parsed_params, GError **error); | | TpIntset *params_present, void *parsed_params, GError **error); | |
| | | | |
| struct _TpBaseConnectionManagerClass { | | struct _TpBaseConnectionManagerClass { | |
| GObjectClass parent_class; | | GObjectClass parent_class; | |
| | | | |
| const char *cm_dbus_name; | | const char *cm_dbus_name; | |
|
| const TpCMProtocolSpec *protocol_params; | | const TpCMProtocolSpec *_TP_SEAL (protocol_params); | |
| TpBaseConnectionManagerNewConnFunc new_connection; | | TpBaseConnectionManagerNewConnFunc _TP_SEAL (new_connection); | |
| | | | |
| const gchar * const *interfaces; | | const gchar * const *interfaces; | |
| | | | |
| /*<private>*/ | | /*<private>*/ | |
| gpointer _future2; | | gpointer _future2; | |
| gpointer _future3; | | gpointer _future3; | |
| gpointer _future4; | | gpointer _future4; | |
| | | | |
| TpBaseConnectionManagerClassPrivate *priv; | | TpBaseConnectionManagerClassPrivate *priv; | |
| }; | | }; | |
| | | | |
End of changes. 1 change blocks. |
| 2 lines changed or deleted | | 2 lines changed or added | |
|
| handle-repo-dynamic.h | | handle-repo-dynamic.h | |
| | | | |
| skipping to change at line 40 | | skipping to change at line 40 | |
| #include <telepathy-glib/handle-repo.h> | | #include <telepathy-glib/handle-repo.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
| typedef struct _TpDynamicHandleRepo TpDynamicHandleRepo; | | typedef struct _TpDynamicHandleRepo TpDynamicHandleRepo; | |
| typedef struct _TpDynamicHandleRepoClass TpDynamicHandleRepoClass; | | typedef struct _TpDynamicHandleRepoClass TpDynamicHandleRepoClass; | |
| | | | |
| typedef gchar *(*TpDynamicHandleRepoNormalizeFunc)(TpHandleRepoIface *repo, | | typedef gchar *(*TpDynamicHandleRepoNormalizeFunc)(TpHandleRepoIface *repo, | |
| const gchar *id, gpointer context, GError **error); | | const gchar *id, gpointer context, GError **error); | |
| | | | |
|
| | | typedef void (*TpDynamicHandleRepoNormalizeAsync) (TpHandleRepoIface *repo, | |
| | | TpBaseConnection *connection, | |
| | | const gchar *id, | |
| | | gpointer context, | |
| | | GAsyncReadyCallback callback, | |
| | | gpointer user_data); | |
| | | typedef gchar * (*TpDynamicHandleRepoNormalizeFinish) (TpHandleRepoIface *r | |
| | | epo, | |
| | | GAsyncResult *result, | |
| | | GError **error); | |
| | | | |
| GType tp_dynamic_handle_repo_get_type (void); | | GType tp_dynamic_handle_repo_get_type (void); | |
| | | | |
| #define TP_TYPE_DYNAMIC_HANDLE_REPO \ | | #define TP_TYPE_DYNAMIC_HANDLE_REPO \ | |
| (tp_dynamic_handle_repo_get_type ()) | | (tp_dynamic_handle_repo_get_type ()) | |
| #define TP_DYNAMIC_HANDLE_REPO(obj) \ | | #define TP_DYNAMIC_HANDLE_REPO(obj) \ | |
| (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_DYNAMIC_HANDLE_REPO,\ | | (G_TYPE_CHECK_INSTANCE_CAST ((obj), TP_TYPE_DYNAMIC_HANDLE_REPO,\ | |
| TpDynamicHandleRepo)) | | TpDynamicHandleRepo)) | |
| #define TP_DYNAMIC_HANDLE_REPO_CLASS(klass) \ | | #define TP_DYNAMIC_HANDLE_REPO_CLASS(klass) \ | |
| (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_DYNAMIC_HANDLE_REPO,\ | | (G_TYPE_CHECK_CLASS_CAST ((klass), TP_TYPE_DYNAMIC_HANDLE_REPO,\ | |
| TpDynamicHandleRepo)) | | TpDynamicHandleRepo)) | |
| | | | |
| skipping to change at line 79 | | skipping to change at line 89 | |
| TpDynamicHandleRepoNormalizeFunc normalize_func
, | | TpDynamicHandleRepoNormalizeFunc normalize_func
, | |
| gpointer default_normalize_context) | | gpointer default_normalize_context) | |
| { | | { | |
| return (TpHandleRepoIface *) g_object_new (TP_TYPE_DYNAMIC_HANDLE_REPO, | | return (TpHandleRepoIface *) g_object_new (TP_TYPE_DYNAMIC_HANDLE_REPO, | |
| "handle-type", (guint)handle_type, | | "handle-type", (guint)handle_type, | |
| "normalize-function", (gpointer)normalize_func, | | "normalize-function", (gpointer)normalize_func, | |
| "default-normalize-context", default_normalize_context, | | "default-normalize-context", default_normalize_context, | |
| NULL); | | NULL); | |
| } | | } | |
| | | | |
|
| | | _TP_AVAILABLE_IN_0_20 | |
| | | void tp_dynamic_handle_repo_set_normalize_async (TpDynamicHandleRepo *self, | |
| | | TpDynamicHandleRepoNormalizeAsync normalize_async, | |
| | | TpDynamicHandleRepoNormalizeFinish normalize_finish); | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| #endif | | #endif | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 16 lines changed or added | |
|
| handle-repo.h | | handle-repo.h | |
| | | | |
| skipping to change at line 33 | | skipping to change at line 33 | |
| | | | |
| #if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
!defined (_TP_COMPILATION) | | #if defined (TP_DISABLE_SINGLE_INCLUDE) && !defined (_TP_IN_META_HEADER) &&
!defined (_TP_COMPILATION) | |
| #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
y-glib-dbus.h> can be included directly." | | #error "Only <telepathy-glib/telepathy-glib.h> and <telepathy-glib/telepath
y-glib-dbus.h> can be included directly." | |
| #endif | | #endif | |
| | | | |
| #ifndef __TP_HANDLE_REPO_H__ | | #ifndef __TP_HANDLE_REPO_H__ | |
| #define __TP_HANDLE_REPO_H__ | | #define __TP_HANDLE_REPO_H__ | |
| | | | |
| #include <glib-object.h> | | #include <glib-object.h> | |
| | | | |
|
| | | #include <gio/gio.h> | |
| | | | |
| #include <telepathy-glib/intset.h> | | #include <telepathy-glib/intset.h> | |
| #include <telepathy-glib/handle.h> | | #include <telepathy-glib/handle.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| | | /* Forward declaration to avoid circular includes */ | |
| | | typedef struct _TpBaseConnection TpBaseConnection; | |
| | | | |
| /* Forward declaration because it's in the HandleRepo API */ | | /* Forward declaration because it's in the HandleRepo API */ | |
| | | | |
| #define TP_TYPE_HANDLE_SET (tp_handle_set_get_type ()) | | #define TP_TYPE_HANDLE_SET (tp_handle_set_get_type ()) | |
| GType tp_handle_set_get_type (void); | | GType tp_handle_set_get_type (void); | |
| | | | |
| typedef struct _TpHandleSet TpHandleSet; | | typedef struct _TpHandleSet TpHandleSet; | |
| | | | |
| /* Handle repository abstract interface */ | | /* Handle repository abstract interface */ | |
| | | | |
| #define TP_TYPE_HANDLE_REPO_IFACE (tp_handle_repo_iface_get_type ()) | | #define TP_TYPE_HANDLE_REPO_IFACE (tp_handle_repo_iface_get_type ()) | |
| | | | |
| skipping to change at line 118 | | skipping to change at line 123 | |
| #endif | | #endif | |
| | | | |
| const char *tp_handle_inspect (TpHandleRepoIface *self, | | const char *tp_handle_inspect (TpHandleRepoIface *self, | |
| TpHandle handle) G_GNUC_WARN_UNUSED_RESULT; | | TpHandle handle) G_GNUC_WARN_UNUSED_RESULT; | |
| TpHandle tp_handle_lookup (TpHandleRepoIface *self, | | TpHandle tp_handle_lookup (TpHandleRepoIface *self, | |
| const gchar *id, gpointer context, GError **error); | | const gchar *id, gpointer context, GError **error); | |
| TpHandle tp_handle_ensure (TpHandleRepoIface *self, | | TpHandle tp_handle_ensure (TpHandleRepoIface *self, | |
| const gchar *id, gpointer context, GError **error) | | const gchar *id, gpointer context, GError **error) | |
| G_GNUC_WARN_UNUSED_RESULT; | | G_GNUC_WARN_UNUSED_RESULT; | |
| | | | |
|
| | | _TP_AVAILABLE_IN_0_20 | |
| | | void tp_handle_ensure_async (TpHandleRepoIface *self, | |
| | | TpBaseConnection *connection, | |
| | | const gchar *id, | |
| | | gpointer context, | |
| | | GAsyncReadyCallback callback, | |
| | | gpointer user_data); | |
| | | _TP_AVAILABLE_IN_0_20 | |
| | | TpHandle tp_handle_ensure_finish (TpHandleRepoIface *self, | |
| | | GAsyncResult *result, | |
| | | GError **error); | |
| | | | |
| void tp_handle_set_qdata (TpHandleRepoIface *repo, TpHandle handle, | | void tp_handle_set_qdata (TpHandleRepoIface *repo, TpHandle handle, | |
| GQuark key_id, gpointer data, GDestroyNotify destroy); | | GQuark key_id, gpointer data, GDestroyNotify destroy); | |
| gpointer tp_handle_get_qdata (TpHandleRepoIface *repo, TpHandle handle, | | gpointer tp_handle_get_qdata (TpHandleRepoIface *repo, TpHandle handle, | |
| GQuark key_id); | | GQuark key_id); | |
| | | | |
| /* Handle set helper class */ | | /* Handle set helper class */ | |
| | | | |
| typedef void (*TpHandleSetMemberFunc)(TpHandleSet *set, TpHandle handle, | | typedef void (*TpHandleSetMemberFunc)(TpHandleSet *set, TpHandle handle, | |
| gpointer userdata); | | gpointer userdata); | |
| | | | |
| | | | |
End of changes. 3 change blocks. |
| 0 lines changed or deleted | | 17 lines changed or added | |
|