base-client.h   base-client.h 
skipping to change at line 44 skipping to change at line 44
#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
typedef struct _TpBaseClient TpBaseClient; typedef struct _TpBaseClient TpBaseClient;
typedef struct _TpBaseClientClass TpBaseClientClass; typedef struct _TpBaseClientClass TpBaseClientClass;
typedef struct _TpBaseClientPrivate TpBaseClientPrivate; typedef struct _TpBaseClientPrivate TpBaseClientPrivate;
typedef struct _TpBaseClientClassPrivate TpBaseClientClassPrivate; typedef struct _TpBaseClientClassPrivate TpBaseClientClassPrivate;
struct _TpBaseClientClass {
/*<private>*/
GObjectClass parent_class;
GCallback _padding[7];
TpDBusPropertiesMixinClass dbus_properties_class;
TpBaseClientClassPrivate *priv;
};
struct _TpBaseClient {
/*<private>*/
GObject parent;
TpBaseClientPrivate *priv;
};
GType tp_base_client_get_type (void);
/* Protected methods; should be called only by subclasses */
typedef void (*TpBaseClientClassObserveChannelsImpl) ( typedef void (*TpBaseClientClassObserveChannelsImpl) (
TpBaseClient *client, TpBaseClient *client,
TpAccount *account, TpAccount *account,
TpConnection *connection, TpConnection *connection,
GList *channels, GList *channels,
TpChannelDispatchOperation *dispatch_operation, TpChannelDispatchOperation *dispatch_operation,
GList *requests, GList *requests,
TpObserveChannelsContext *context); TpObserveChannelsContext *context);
void tp_base_client_implement_observe_channels (TpBaseClientClass *klass,
TpBaseClientClassObserveChannelsImpl impl);
typedef void (*TpBaseClientClassAddDispatchOperationImpl) ( typedef void (*TpBaseClientClassAddDispatchOperationImpl) (
TpBaseClient *client, TpBaseClient *client,
TpAccount *account, TpAccount *account,
TpConnection *connection, TpConnection *connection,
GList *channels, GList *channels,
TpChannelDispatchOperation *dispatch_operation, TpChannelDispatchOperation *dispatch_operation,
TpAddDispatchOperationContext *context); TpAddDispatchOperationContext *context);
void tp_base_client_implement_add_dispatch_operation (TpBaseClientClass *kl
ass,
TpBaseClientClassAddDispatchOperationImpl impl);
typedef void (*TpBaseClientClassHandleChannelsImpl) ( typedef void (*TpBaseClientClassHandleChannelsImpl) (
TpBaseClient *client, TpBaseClient *client,
TpAccount *account, TpAccount *account,
TpConnection *connection, TpConnection *connection,
GList *channels, GList *channels,
GList *requests_satisfied, GList *requests_satisfied,
gint64 user_action_time, gint64 user_action_time,
TpHandleChannelsContext *context); TpHandleChannelsContext *context);
struct _TpBaseClientClass {
/*<public>*/
GObjectClass parent_class;
TpBaseClientClassObserveChannelsImpl observe_channels;
TpBaseClientClassAddDispatchOperationImpl add_dispatch_operation;
TpBaseClientClassHandleChannelsImpl handle_channels;
/*<private>*/
GCallback _padding[4];
TpDBusPropertiesMixinClass dbus_properties_class;
TpBaseClientClassPrivate *priv;
};
struct _TpBaseClient {
/*<private>*/
GObject parent;
TpBaseClientPrivate *priv;
};
GType tp_base_client_get_type (void);
/* Protected methods; should be called only by subclasses */
void tp_base_client_implement_observe_channels (TpBaseClientClass *klass,
TpBaseClientClassObserveChannelsImpl impl);
void tp_base_client_implement_add_dispatch_operation (TpBaseClientClass *kl
ass,
TpBaseClientClassAddDispatchOperationImpl impl);
void tp_base_client_implement_handle_channels (TpBaseClientClass *klass, void tp_base_client_implement_handle_channels (TpBaseClientClass *klass,
TpBaseClientClassHandleChannelsImpl impl); TpBaseClientClassHandleChannelsImpl impl);
/* setup functions which can only be called before register() */ /* setup functions which can only be called before register() */
void tp_base_client_add_observer_filter (TpBaseClient *self, void tp_base_client_add_observer_filter (TpBaseClient *self,
GHashTable *filter); GHashTable *filter);
void tp_base_client_take_observer_filter (TpBaseClient *self, void tp_base_client_take_observer_filter (TpBaseClient *self,
GHashTable *filter); GHashTable *filter);
 End of changes. 4 change blocks. 
25 lines changed or deleted 29 lines changed or added


 channel-dispatch-operation.h   channel-dispatch-operation.h 
skipping to change at line 124 skipping to change at line 124
gpointer user_data); gpointer user_data);
gboolean tp_channel_dispatch_operation_claim_finish ( gboolean tp_channel_dispatch_operation_claim_finish (
TpChannelDispatchOperation *self, TpChannelDispatchOperation *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void tp_channel_dispatch_operation_handle_with_time_async ( void tp_channel_dispatch_operation_handle_with_time_async (
TpChannelDispatchOperation *self, TpChannelDispatchOperation *self,
const gchar *handler, const gchar *handler,
gint64 user_action_timestamp, gint64 user_action_time,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean tp_channel_dispatch_operation_handle_with_time_finish ( gboolean tp_channel_dispatch_operation_handle_with_time_finish (
TpChannelDispatchOperation *self, TpChannelDispatchOperation *self,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
G_END_DECLS G_END_DECLS
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 defs.h   defs.h 
skipping to change at line 106 skipping to change at line 106
#define TP_CHANNEL_DISPATCHER_OBJECT_PATH "/org/freedesktop/Telepathy/Chann elDispatcher" #define TP_CHANNEL_DISPATCHER_OBJECT_PATH "/org/freedesktop/Telepathy/Chann elDispatcher"
/** /**
* TP_CLIENT_BUS_NAME_BASE: * TP_CLIENT_BUS_NAME_BASE:
* *
* The common prefix of the well-known bus name for any Telepathy Client. * The common prefix of the well-known bus name for any Telepathy Client.
*/ */
#define TP_CLIENT_BUS_NAME_BASE "org.freedesktop.Telepathy.Client." #define TP_CLIENT_BUS_NAME_BASE "org.freedesktop.Telepathy.Client."
/** /**
* TP_CLIENT_OBJECT_PATH_BASE * TP_CLIENT_OBJECT_PATH_BASE:
* *
* The common prefix of the well-known object path for any Telepathy Client . * The common prefix of the well-known object path for any Telepathy Client .
*/ */
#define TP_CLIENT_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/Client/" #define TP_CLIENT_OBJECT_PATH_BASE "/org/freedesktop/Telepathy/Client/"
/**
* TP_USER_ACTION_TIME_NOT_USER_ACTION:
*
* The "user action time" used by methods like
* tp_account_channel_request_new() to represent channel requests that are
* not a result of user action.
*
* See also #TpAccountChannelRequest:user-action-time,
* tp_user_action_time_from_x11(), tp_user_action_time_should_present() and
* %TP_USER_ACTION_TIME_CURRENT_TIME.
*
* Since: 0.11.13
*/
#define TP_USER_ACTION_TIME_NOT_USER_ACTION (G_GINT64_CONSTANT (0))
/**
* TP_USER_ACTION_TIME_CURRENT_TIME:
*
* The "user action time" used by methods like
* tp_account_channel_request_new() to represent channel requests that shou
ld
* be treated as though they happened at the current time. This is the same
* concept as %GDK_CURRENT_TIME in Gdk (but note that the numerical value u
sed
* in Telepathy is not the same).
*
* See also #TpAccountChannelRequest:user-action-time,
* tp_user_action_time_from_x11(), tp_user_action_time_should_present() and
* %TP_USER_ACTION_TIME_NOT_USER_ACTION.
*
* Since: 0.11.13
*/
#define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64)
/* telepathy-glib-specific version of G_GNUC_DEPRECATED so our regression /* telepathy-glib-specific version of G_GNUC_DEPRECATED so our regression
* tests can continue to test deprecated functionality, while avoiding * tests can continue to test deprecated functionality, while avoiding
* deprecated bits of other libraries */ * deprecated bits of other libraries */
#ifdef _TP_IGNORE_DEPRECATIONS #ifdef _TP_IGNORE_DEPRECATIONS
#define _TP_GNUC_DEPRECATED /* nothing */ #define _TP_GNUC_DEPRECATED /* nothing */
#else #else
#define _TP_GNUC_DEPRECATED G_GNUC_DEPRECATED #define _TP_GNUC_DEPRECATED G_GNUC_DEPRECATED
#endif #endif
G_END_DECLS G_END_DECLS
 End of changes. 2 change blocks. 
1 lines changed or deleted 35 lines changed or added


 errors.h   errors.h 
skipping to change at line 32 skipping to change at line 32
#define __TP_ERRORS_H__ #define __TP_ERRORS_H__
#include <glib-object.h> #include <glib-object.h>
#include <telepathy-glib/_gen/error-str.h> #include <telepathy-glib/_gen/error-str.h>
#include <telepathy-glib/_gen/genums.h> #include <telepathy-glib/_gen/genums.h>
G_BEGIN_DECLS G_BEGIN_DECLS
GQuark tp_errors_quark (void); GQuark tp_errors_quark (void);
GQuark tp_error_quark (void);
#define TP_ERROR_PREFIX "org.freedesktop.Telepathy.Error" #define TP_ERROR_PREFIX "org.freedesktop.Telepathy.Error"
#define TP_ERRORS (tp_errors_quark ()) #define TP_ERRORS TP_ERROR
#define TP_ERROR TP_ERRORS #define TP_ERROR (tp_error_quark ())
void tp_g_set_error_invalid_handle_type (guint type, GError **error); void tp_g_set_error_invalid_handle_type (guint type, GError **error);
void tp_g_set_error_unsupported_handle_type (guint type, GError **error); void tp_g_set_error_unsupported_handle_type (guint type, GError **error);
typedef enum { typedef enum {
TP_ERROR_NETWORK_ERROR, /*< nick=NetworkError >*/ TP_ERROR_NETWORK_ERROR, /*< nick=NetworkError >*/
TP_ERROR_NOT_IMPLEMENTED, /*< nick=NotImplemented >*/ TP_ERROR_NOT_IMPLEMENTED, /*< nick=NotImplemented >*/
TP_ERROR_INVALID_ARGUMENT, /*< nick=InvalidArgument >*/ TP_ERROR_INVALID_ARGUMENT, /*< nick=InvalidArgument >*/
TP_ERROR_NOT_AVAILABLE, /*< nick=NotAvailable >*/ TP_ERROR_NOT_AVAILABLE, /*< nick=NotAvailable >*/
TP_ERROR_PERMISSION_DENIED, /*< nick=PermissionDenied >*/ TP_ERROR_PERMISSION_DENIED, /*< nick=PermissionDenied >*/
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 lines changed or added


 util.h   util.h 
skipping to change at line 144 skipping to change at line 144
\ \
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, void tp_simple_async_report_success_in_idle (GObject *source,
GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag); GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag);
gint64 tp_user_action_time_from_x11 (guint32 x11_time);
gboolean tp_user_action_time_should_present (gint64 user_action_time,
guint32 *x11_time);
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. 1 change blocks. 
0 lines changed or deleted 4 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/