connection.h   connection.h 
skipping to change at line 52 skipping to change at line 52
GCallback _3; GCallback _3;
GCallback _4; GCallback _4;
}; };
struct _TpConnection { struct _TpConnection {
/*<private>*/ /*<private>*/
TpProxy parent; TpProxy parent;
TpConnectionPrivate *priv; TpConnectionPrivate *priv;
}; };
typedef struct _TpAvatarRequirements TpAvatarRequirements;
struct _TpAvatarRequirements
{
gchar **supported_mime_types;
guint minimum_width;
guint minimum_height;
guint recommended_width;
guint recommended_height;
guint maximum_width;
guint maximum_height;
guint maximum_bytes;
/*<private>*/
gpointer _1;
gpointer _2;
gpointer _3;
gpointer _4;
};
#define TP_TYPE_AVATAR_REQUIREMENTS (tp_avatar_requirements_get_type ())
GType tp_avatar_requirements_get_type (void);
TpAvatarRequirements * tp_avatar_requirements_new (
GStrv supported_mime_types,
guint minimum_width,
guint minimum_height,
guint recommended_width,
guint recommended_height,
guint maximum_width,
guint maximum_height,
guint maximum_bytes);
TpAvatarRequirements * tp_avatar_requirements_copy (
TpAvatarRequirements *self);
void tp_avatar_requirements_destroy (TpAvatarRequirements *self);
GType tp_connection_get_type (void); GType tp_connection_get_type (void);
#define TP_ERRORS_DISCONNECTED (tp_errors_disconnected_quark ()) #define TP_ERRORS_DISCONNECTED (tp_errors_disconnected_quark ())
GQuark tp_errors_disconnected_quark (void); GQuark tp_errors_disconnected_quark (void);
#define TP_UNKNOWN_CONNECTION_STATUS ((TpConnectionStatus) -1) #define TP_UNKNOWN_CONNECTION_STATUS ((TpConnectionStatus) -1)
/* TYPE MACROS */ /* TYPE MACROS */
#define TP_TYPE_CONNECTION \ #define TP_TYPE_CONNECTION \
(tp_connection_get_type ()) (tp_connection_get_type ())
skipping to change at line 86 skipping to change at line 123
TpConnection *tp_connection_new (TpDBusDaemon *dbus, const gchar *bus_name, TpConnection *tp_connection_new (TpDBusDaemon *dbus, const gchar *bus_name,
const gchar *object_path, GError **error) G_GNUC_WARN_UNUSED_RESULT; const gchar *object_path, GError **error) G_GNUC_WARN_UNUSED_RESULT;
TpConnectionStatus tp_connection_get_status (TpConnection *self, TpConnectionStatus tp_connection_get_status (TpConnection *self,
TpConnectionStatusReason *reason); TpConnectionStatusReason *reason);
TpHandle tp_connection_get_self_handle (TpConnection *self); TpHandle tp_connection_get_self_handle (TpConnection *self);
TpCapabilities * tp_connection_get_capabilities (TpConnection *self); TpCapabilities * tp_connection_get_capabilities (TpConnection *self);
TpAvatarRequirements * tp_connection_get_avatar_requirements (
TpConnection *self);
gboolean tp_connection_is_ready (TpConnection *self); gboolean tp_connection_is_ready (TpConnection *self);
#ifndef TP_DISABLE_DEPRECATED #ifndef TP_DISABLE_DEPRECATED
gboolean tp_connection_run_until_ready (TpConnection *self, gboolean tp_connection_run_until_ready (TpConnection *self,
gboolean connect, GError **error, gboolean connect, GError **error,
GMainLoop **loop) _TP_GNUC_DEPRECATED; GMainLoop **loop) _TP_GNUC_DEPRECATED;
#endif #endif
typedef void (*TpConnectionWhenReadyCb) (TpConnection *connection, typedef void (*TpConnectionWhenReadyCb) (TpConnection *connection,
const GError *error, gpointer user_data); const GError *error, gpointer user_data);
skipping to change at line 118 skipping to change at line 158
GObject *weak_object); GObject *weak_object);
void tp_connection_init_known_interfaces (void); void tp_connection_init_known_interfaces (void);
gint tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1, gint tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,
TpConnectionPresenceType p2); TpConnectionPresenceType p2);
gboolean tp_connection_parse_object_path (TpConnection *self, gchar **proto col, gboolean tp_connection_parse_object_path (TpConnection *self, gchar **proto col,
gchar **cm_name); gchar **cm_name);
const gchar *tp_connection_get_detailed_error (TpConnection *self,
const GHashTable **details);
#define TP_CONNECTION_FEATURE_CORE \ #define TP_CONNECTION_FEATURE_CORE \
(tp_connection_get_feature_quark_core ()) (tp_connection_get_feature_quark_core ())
GQuark tp_connection_get_feature_quark_core (void) G_GNUC_CONST; GQuark tp_connection_get_feature_quark_core (void) G_GNUC_CONST;
#define TP_CONNECTION_FEATURE_CONNECTED \ #define TP_CONNECTION_FEATURE_CONNECTED \
(tp_connection_get_feature_quark_connected ()) (tp_connection_get_feature_quark_connected ())
GQuark tp_connection_get_feature_quark_connected (void) G_GNUC_CONST; GQuark tp_connection_get_feature_quark_connected (void) G_GNUC_CONST;
#define TP_CONNECTION_FEATURE_CAPABILITIES \ #define TP_CONNECTION_FEATURE_CAPABILITIES \
(tp_connection_get_feature_quark_capabilities ()) (tp_connection_get_feature_quark_capabilities ())
GQuark tp_connection_get_feature_quark_capabilities (void) G_GNUC_CONST; GQuark tp_connection_get_feature_quark_capabilities (void) G_GNUC_CONST;
#define TP_CONNECTION_FEATURE_AVATAR_REQUIREMENTS \
(tp_connection_get_feature_quark_avatar_requirements ())
GQuark tp_connection_get_feature_quark_avatar_requirements (void) G_GNUC_CO
NST;
/* connection-handles.c */ /* connection-handles.c */
typedef void (*TpConnectionHoldHandlesCb) (TpConnection *connection, typedef void (*TpConnectionHoldHandlesCb) (TpConnection *connection,
TpHandleType handle_type, guint n_handles, const TpHandle *handles, TpHandleType handle_type, guint n_handles, const TpHandle *handles,
const GError *error, gpointer user_data, GObject *weak_object); const GError *error, gpointer user_data, GObject *weak_object);
void tp_connection_hold_handles (TpConnection *self, gint timeout_ms, void tp_connection_hold_handles (TpConnection *self, gint timeout_ms,
TpHandleType handle_type, guint n_handles, const TpHandle *handles, TpHandleType handle_type, guint n_handles, const TpHandle *handles,
TpConnectionHoldHandlesCb callback, TpConnectionHoldHandlesCb callback,
gpointer user_data, GDestroyNotify destroy, GObject *weak_object); gpointer user_data, GDestroyNotify destroy, GObject *weak_object);
 End of changes. 4 change blocks. 
0 lines changed or deleted 48 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/