dbus-properties-mixin.h   dbus-properties-mixin.h 
skipping to change at line 141 skipping to change at line 141
const gchar *interface_name, const gchar *property_name, const gchar *interface_name, const gchar *property_name,
GValue *value, GError **error); GValue *value, GError **error);
_TP_AVAILABLE_IN_0_16 _TP_AVAILABLE_IN_0_16
gboolean tp_dbus_properties_mixin_set ( gboolean tp_dbus_properties_mixin_set (
GObject *self, GObject *self,
const gchar *interface_name, const gchar *interface_name,
const gchar *property_name, const gchar *property_name,
const GValue *value, const GValue *value,
GError **error); GError **error);
_TP_AVAILABLE_IN_1_0 _TP_AVAILABLE_IN_0_22
GHashTable *tp_dbus_properties_mixin_dup_all (GObject *self, GHashTable *tp_dbus_properties_mixin_dup_all (GObject *self,
const gchar *interface_name); const gchar *interface_name);
GHashTable *tp_dbus_properties_mixin_make_properties_hash ( GHashTable *tp_dbus_properties_mixin_make_properties_hash (
GObject *object, const gchar *first_interface, GObject *object, const gchar *first_interface,
const gchar *first_property, ...) const gchar *first_property, ...)
G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT; G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT;
void tp_dbus_properties_mixin_fill_properties_hash (GObject *object, void tp_dbus_properties_mixin_fill_properties_hash (GObject *object,
GHashTable *table, GHashTable *table,
 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 40 skipping to change at line 40
#include <telepathy-glib/version.h> #include <telepathy-glib/version.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#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_0_22 (_TP_ENCODE_VERSION (0, 22))
#define TP_VERSION_0_24 (_TP_ENCODE_VERSION (0, 24))
#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 109 skipping to change at line 110
#endif #endif
#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_22 #if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_22
# define _TP_DEPRECATED_IN_0_22 _TP_DEPRECATED # define _TP_DEPRECATED_IN_0_22 _TP_DEPRECATED
# define _TP_DEPRECATED_IN_0_22_FOR(f) _TP_DEPRECATED_FOR(f) # define _TP_DEPRECATED_IN_0_22_FOR(f) _TP_DEPRECATED_FOR(f)
#else #else
# define _TP_DEPRECATED_IN_0_22 /* nothing */ # define _TP_DEPRECATED_IN_0_22 /* nothing */
# define _TP_DEPRECATED_IN_0_22_FOR(f) /* nothing */ # define _TP_DEPRECATED_IN_0_22_FOR(f) /* nothing */
#endif #endif
#if TP_VERSION_MIN_REQUIRED >= TP_VERSION_0_24
# define _TP_DEPRECATED_IN_0_24 _TP_DEPRECATED
# define _TP_DEPRECATED_IN_0_24_FOR(f) _TP_DEPRECATED_FOR(f)
#else
# define _TP_DEPRECATED_IN_0_24 /* nothing */
# define _TP_DEPRECATED_IN_0_24_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
 End of changes. 2 change blocks. 
0 lines changed or deleted 9 lines changed or added


 telepathy-glib-dbus.h   telepathy-glib-dbus.h 
skipping to change at line 27 skipping to change at line 27
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* 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_GLIB_DBUS_H__ #ifndef __TP_GLIB_DBUS_H__
#define __TP_GLIB_DBUS_H__ #define __TP_GLIB_DBUS_H__
#include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/telepathy-glib.h>
#define _TP_GLIB_DBUS_H_INSIDE #define _TP_GLIB_DBUS_H_INSIDE
#define _TP_GLIB_H_INSIDE
/* common */ /* common */
#include <telepathy-glib/gtypes.h> #include <telepathy-glib/gtypes.h>
#include <telepathy-glib/interfaces.h> #include <telepathy-glib/interfaces.h>
/* client-side */ /* client-side */
#include <telepathy-glib/_gen/tp-cli-account.h> #include <telepathy-glib/_gen/tp-cli-account.h>
#include <telepathy-glib/_gen/tp-cli-account-manager.h> #include <telepathy-glib/_gen/tp-cli-account-manager.h>
#include <telepathy-glib/_gen/tp-cli-call-content.h> #include <telepathy-glib/_gen/tp-cli-call-content.h>
#include <telepathy-glib/_gen/tp-cli-call-content-media-description.h> #include <telepathy-glib/_gen/tp-cli-call-content-media-description.h>
skipping to change at line 70 skipping to change at line 69
#include <telepathy-glib/svc-client.h> #include <telepathy-glib/svc-client.h>
#include <telepathy-glib/svc-connection.h> #include <telepathy-glib/svc-connection.h>
#include <telepathy-glib/svc-connection-manager.h> #include <telepathy-glib/svc-connection-manager.h>
#include <telepathy-glib/svc-debug.h> #include <telepathy-glib/svc-debug.h>
#include <telepathy-glib/svc-generic.h> #include <telepathy-glib/svc-generic.h>
#include <telepathy-glib/svc-properties-interface.h> #include <telepathy-glib/svc-properties-interface.h>
#include <telepathy-glib/svc-protocol.h> #include <telepathy-glib/svc-protocol.h>
#include <telepathy-glib/svc-tls.h> #include <telepathy-glib/svc-tls.h>
#undef _TP_GLIB_DBUS_H_INSIDE #undef _TP_GLIB_DBUS_H_INSIDE
#undef _TP_GLIB_H_INSIDE
#endif /* __TP_GLIB_DBUS_H__ */ #endif /* __TP_GLIB_DBUS_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 0 lines changed or added


 util.h   util.h 
skipping to change at line 108 skipping to change at line 108
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,
...); ...);
/* Work around GLib having deprecated something that is part of our API. */
_TP_AVAILABLE_IN_1_0
void tp_value_array_free (GValueArray *va);
#if TP_VERSION_MAX_ALLOWED >= _TP_VERSION_1_0
#define tp_value_array_free(va) _tp_value_array_free_inline (va)
#ifndef __GTK_DOC_IGNORE__ /* gtk-doc can't parse this */
static inline void
_tp_value_array_free_inline (GValueArray *va)
{
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
g_value_array_free (va);
G_GNUC_END_IGNORE_DEPRECATIONS
}
#endif
#endif
/* See https://bugzilla.gnome.org/show_bug.cgi?id=680813 for glib inclusion */ /* 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) \
 End of changes. 1 change blocks. 
0 lines changed or deleted 16 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 99 #define TP_MINOR_VERSION 99
#define TP_MICRO_VERSION 1 #define TP_MICRO_VERSION 2
 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/