defs.h   defs.h 
skipping to change at line 162 skipping to change at line 162
* *
* Since: 0.11.13 * Since: 0.11.13
*/ */
#define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64) #define TP_USER_ACTION_TIME_CURRENT_TIME (G_MAXINT64)
#define _TP_ENCODE_VERSION(major, minor) (((major) << 16) | ((minor) << 8)) #define _TP_ENCODE_VERSION(major, minor) (((major) << 16) | ((minor) << 8))
#define TP_VERSION_0_16 (_TP_ENCODE_VERSION (0, 16)) #define TP_VERSION_0_16 (_TP_ENCODE_VERSION (0, 16))
#define TP_VERSION_0_18 (_TP_ENCODE_VERSION (0, 18)) #define TP_VERSION_0_18 (_TP_ENCODE_VERSION (0, 18))
#define TP_VERSION_0_20 (_TP_ENCODE_VERSION (0, 20)) #define TP_VERSION_0_20 (_TP_ENCODE_VERSION (0, 20))
#define TP_VERSION_0_22 (_TP_ENCODE_VERSION (0, 22))
#define TP_VERSION_1_0 (_TP_ENCODE_VERSION (1, 0)) #define TP_VERSION_1_0 (_TP_ENCODE_VERSION (1, 0))
#if (TP_MINOR_VERSION == 99) #if (TP_MINOR_VERSION == 99)
/* special case for telepathy-glib 1.0 prereleases */ /* special case for telepathy-glib 1.0 prereleases */
# define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION + 1, 0)) # define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION + 1, 0))
#elif (TP_MINOR_VERSION == 0) #elif (TP_MINOR_VERSION == 0)
/* special case for telepathy-glib 1.0 itself */ /* special case for telepathy-glib 1.0 itself */
# define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, 0)) # define _TP_VERSION_CUR_STABLE (_TP_ENCODE_VERSION (TP_MAJOR_VERSION, 0))
#elif (TP_MICRO_VERSION >= 99 && (TP_MINOR_VERSION % 2) == 0) #elif (TP_MICRO_VERSION >= 99 && (TP_MINOR_VERSION % 2) == 0)
/* development branch about to start (0.18.999.1) */ /* development branch about to start (0.18.999.1) */
skipping to change at line 223 skipping to change at line 224
#endif #endif
#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_20 #if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_20
# define _TP_DEPRECATED_IN_0_20 _TP_DEPRECATED # define _TP_DEPRECATED_IN_0_20 _TP_DEPRECATED
# define _TP_DEPRECATED_IN_0_20_FOR(f) _TP_DEPRECATED_FOR(f) # define _TP_DEPRECATED_IN_0_20_FOR(f) _TP_DEPRECATED_FOR(f)
#else #else
# define _TP_DEPRECATED_IN_0_20 /* nothing */ # define _TP_DEPRECATED_IN_0_20 /* nothing */
# define _TP_DEPRECATED_IN_0_20_FOR(f) /* nothing */ # define _TP_DEPRECATED_IN_0_20_FOR(f) /* nothing */
#endif #endif
#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_22
# define _TP_DEPRECATED_IN_0_22 _TP_DEPRECATED
# define _TP_DEPRECATED_IN_0_22_FOR(f) _TP_DEPRECATED_FOR(f)
#else
# define _TP_DEPRECATED_IN_0_22 /* nothing */
# define _TP_DEPRECATED_IN_0_22_FOR(f) /* nothing */
#endif
#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_1_0 #if TP_VERSION_MIN_REQUIRED >= TP_VERSION_1_0
# define _TP_DEPRECATED_IN_1_0 _TP_DEPRECATED # define _TP_DEPRECATED_IN_1_0 _TP_DEPRECATED
# define _TP_DEPRECATED_IN_1_0_FOR(f) _TP_DEPRECATED_FOR(f) # define _TP_DEPRECATED_IN_1_0_FOR(f) _TP_DEPRECATED_FOR(f)
#else #else
# define _TP_DEPRECATED_IN_1_0 /* nothing */ # define _TP_DEPRECATED_IN_1_0 /* nothing */
# define _TP_DEPRECATED_IN_1_0_FOR(f) /* nothing */ # define _TP_DEPRECATED_IN_1_0_FOR(f) /* nothing */
#endif #endif
#if TP_VERSION_MIN_REQUIRED >= _TP_VERSION_CUR_STABLE #if TP_VERSION_MIN_REQUIRED >= _TP_VERSION_CUR_STABLE
# define _TP_DEPRECATED_IN_UNRELEASED _TP_DEPRECATED # define _TP_DEPRECATED_IN_UNRELEASED _TP_DEPRECATED
skipping to change at line 257 skipping to change at line 266
#else #else
# define _TP_AVAILABLE_IN_0_18 /* nothing */ # define _TP_AVAILABLE_IN_0_18 /* nothing */
#endif #endif
#if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_20 #if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_20
# define _TP_AVAILABLE_IN_0_20 _TP_UNAVAILABLE(0, 20) # define _TP_AVAILABLE_IN_0_20 _TP_UNAVAILABLE(0, 20)
#else #else
# define _TP_AVAILABLE_IN_0_20 /* nothing */ # define _TP_AVAILABLE_IN_0_20 /* nothing */
#endif #endif
#if TP_VERSION_MAX_ALLOWED < TP_VERSION_0_22
# define _TP_AVAILABLE_IN_0_22 _TP_UNAVAILABLE(0, 22)
#else
# define _TP_AVAILABLE_IN_0_22 /* nothing */
#endif
#if TP_VERSION_MAX_ALLOWED < TP_VERSION_1_0 #if TP_VERSION_MAX_ALLOWED < TP_VERSION_1_0
# define _TP_AVAILABLE_IN_1_0 _TP_UNAVAILABLE(1, 0) # define _TP_AVAILABLE_IN_1_0 _TP_UNAVAILABLE(1, 0)
#else #else
# define _TP_AVAILABLE_IN_1_0 /* nothing */ # define _TP_AVAILABLE_IN_1_0 /* nothing */
#endif #endif
#if TP_VERSION_MAX_ALLOWED < _TP_VERSION_CUR_STABLE #if TP_VERSION_MAX_ALLOWED < _TP_VERSION_CUR_STABLE
# define _TP_AVAILABLE_IN_UNRELEASED \ # define _TP_AVAILABLE_IN_UNRELEASED \
_TP_UNAVAILABLE (TP_MAJOR_VERSION, TP_MINOR_VERSION) _TP_UNAVAILABLE (TP_MAJOR_VERSION, TP_MINOR_VERSION)
#else #else
 End of changes. 3 change blocks. 
0 lines changed or deleted 15 lines changed or added


 util.h   util.h 
skipping to change at line 32 skipping to change at line 32
#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_UTIL_H__ #ifndef __TP_UTIL_H__
#define __TP_UTIL_H__ #define __TP_UTIL_H__
#define __TP_IN_UTIL_H__ #define __TP_IN_UTIL_H__
#include <gio/gio.h> #include <gio/gio.h>
#include <telepathy-glib/defs.h>
#include <telepathy-glib/verify.h> #include <telepathy-glib/verify.h>
#define tp_verify_statement(R) ((void) tp_verify_true (R)) #define tp_verify_statement(R) ((void) tp_verify_true (R))
G_BEGIN_DECLS G_BEGIN_DECLS
gboolean tp_g_ptr_array_contains (GPtrArray *haystack, gpointer needle); gboolean tp_g_ptr_array_contains (GPtrArray *haystack, gpointer needle);
void tp_g_ptr_array_extend (GPtrArray *target, GPtrArray *source); void tp_g_ptr_array_extend (GPtrArray *target, GPtrArray *source);
#ifndef __GI_SCANNER__ #ifndef __GI_SCANNER__
skipping to change at line 78 skipping to change at line 79
#endif #endif
void tp_g_value_slice_free (GValue *value); void tp_g_value_slice_free (GValue *value);
GValue *tp_g_value_slice_dup (const GValue *value) G_GNUC_WARN_UNUSED_RESUL T; GValue *tp_g_value_slice_dup (const GValue *value) G_GNUC_WARN_UNUSED_RESUL T;
void tp_g_hash_table_update (GHashTable *target, GHashTable *source, void tp_g_hash_table_update (GHashTable *target, GHashTable *source,
GBoxedCopyFunc key_dup, GBoxedCopyFunc value_dup); GBoxedCopyFunc key_dup, GBoxedCopyFunc value_dup);
/* See https://bugzilla.gnome.org/show_bug.cgi?id=399880 for glib inclusion */
static inline gboolean static inline gboolean
tp_str_empty (const gchar *s) tp_str_empty (const gchar *s)
{ {
return (s == NULL || s[0] == '\0'); return (s == NULL || s[0] == '\0');
} }
/* See https://bugzilla.gnome.org/show_bug.cgi?id=685878 for glib inclusion */
gboolean tp_strdiff (const gchar *left, const gchar *right); gboolean tp_strdiff (const gchar *left, const gchar *right);
gpointer tp_mixin_offset_cast (gpointer instance, guint offset); gpointer tp_mixin_offset_cast (gpointer instance, guint offset);
guint tp_mixin_instance_get_offset (gpointer instance, GQuark quark); guint tp_mixin_instance_get_offset (gpointer instance, GQuark quark);
guint tp_mixin_class_get_offset (gpointer klass, GQuark quark); guint tp_mixin_class_get_offset (gpointer klass, GQuark quark);
gchar *tp_escape_as_identifier (const gchar *name) G_GNUC_WARN_UNUSED_RESUL T; gchar *tp_escape_as_identifier (const gchar *name) G_GNUC_WARN_UNUSED_RESUL T;
/* See https://bugzilla.gnome.org/show_bug.cgi?id=685880 for glib inclusion */
gboolean tp_strv_contains (const gchar * const *strv, const gchar *str); gboolean tp_strv_contains (const gchar * const *strv, const gchar *str);
#ifndef TP_DISABLE_DEPRECATED
_TP_DEPRECATED_IN_0_22_FOR(g_key_file_get_int64)
gint64 tp_g_key_file_get_int64 (GKeyFile *key_file, const gchar *group_name , gint64 tp_g_key_file_get_int64 (GKeyFile *key_file, const gchar *group_name ,
const gchar *key, GError **error); const gchar *key, GError **error);
_TP_DEPRECATED_IN_0_22_FOR(g_key_file_get_uint64)
guint64 tp_g_key_file_get_uint64 (GKeyFile *key_file, const gchar *group_na me, guint64 tp_g_key_file_get_uint64 (GKeyFile *key_file, const gchar *group_na me,
const gchar *key, GError **error); const gchar *key, GError **error);
#endif
/* g_signal_connect_object() has been fixed in GLib 2.36, we can deprecate
this
* once we depend on that version. */
gulong tp_g_signal_connect_object (gpointer instance, gulong tp_g_signal_connect_object (gpointer instance,
const gchar *detailed_signal, GCallback c_handler, gpointer gobject, const gchar *detailed_signal, GCallback c_handler, gpointer gobject,
GConnectFlags connect_flags); GConnectFlags connect_flags);
GValueArray *tp_value_array_build (gsize length, GValueArray *tp_value_array_build (gsize length,
GType type, GType type,
...) G_GNUC_WARN_UNUSED_RESULT; ...) G_GNUC_WARN_UNUSED_RESULT;
void tp_value_array_unpack (GValueArray *array, void tp_value_array_unpack (GValueArray *array,
gsize len, gsize len,
...); ...);
/* See https://bugzilla.gnome.org/show_bug.cgi?id=680813 for glib inclusion */
typedef struct _TpWeakRef TpWeakRef; typedef struct _TpWeakRef TpWeakRef;
TpWeakRef *tp_weak_ref_new (gpointer object, TpWeakRef *tp_weak_ref_new (gpointer object,
gpointer user_data, gpointer user_data,
GDestroyNotify destroy) G_GNUC_WARN_UNUSED_RESULT; GDestroyNotify destroy) G_GNUC_WARN_UNUSED_RESULT;
gpointer tp_weak_ref_get_user_data (TpWeakRef *self) G_GNUC_WARN_UNUSED_RES ULT; gpointer tp_weak_ref_get_user_data (TpWeakRef *self) G_GNUC_WARN_UNUSED_RES ULT;
gpointer tp_weak_ref_dup_object (TpWeakRef *self) G_GNUC_WARN_UNUSED_RESULT ; gpointer tp_weak_ref_dup_object (TpWeakRef *self) G_GNUC_WARN_UNUSED_RESULT ;
void tp_weak_ref_destroy (TpWeakRef *self); void tp_weak_ref_destroy (TpWeakRef *self);
#define tp_clear_pointer(pp, destroy) \ #define tp_clear_pointer(pp, destroy) \
G_STMT_START \ G_STMT_START \
skipping to change at line 153 skipping to change at line 164
} \ } \
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); gint64 tp_user_action_time_from_x11 (guint32 x11_time);
gboolean tp_user_action_time_should_present (gint64 user_action_time, gboolean tp_user_action_time_should_present (gint64 user_action_time,
guint32 *x11_time); guint32 *x11_time);
/* See https://bugzilla.gnome.org/show_bug.cgi?id=610969 for glib inclusion */
gchar *tp_utf8_make_valid (const gchar *name); gchar *tp_utf8_make_valid (const gchar *name);
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. 10 change blocks. 
0 lines changed or deleted 13 lines changed or added


 version.h   version.h 
/* telepathy-glib/version.h. Generated from version.h.in by configure. */ /* telepathy-glib/version.h. Generated from version.h.in by configure. */
#define TP_MAJOR_VERSION 0 #define TP_MAJOR_VERSION 0
#define TP_MINOR_VERSION 20 #define TP_MINOR_VERSION 21
#define TP_MICRO_VERSION 4 #define TP_MICRO_VERSION 0
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 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/