diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-09-28 20:57:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-03-30 20:30:25 +0100 |
| commit | 2195e11aa71b66e2221171b7cb7b6ca008c4449b (patch) | |
| tree | c60952ff31015f8a251ae1a4feb449c3f2b5ce12 /telepathy-glib | |
| parent | d0c9a2744cf25511712bdcf7edf083cfce9b8029 (diff) | |
| download | telepathy-glib-2195e11aa71b66e2221171b7cb7b6ca008c4449b.tar.gz | |
Deprecate tp_channel_run_until_ready
Diffstat (limited to 'telepathy-glib')
| -rw-r--r-- | telepathy-glib/channel.c | 3 | ||||
| -rw-r--r-- | telepathy-glib/channel.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c index 89c3f565c..55d2f3aad 100644 --- a/telepathy-glib/channel.c +++ b/telepathy-glib/channel.c @@ -1502,6 +1502,9 @@ finally: * %FALSE if the channel has become invalid. * * Since: 0.7.1 + * Deprecated: since 0.9.UNRELEASED. Use tp_connection_call_when_ready, + * or restructure your program in such a way as to avoid re-entering the + * main loop. */ gboolean tp_channel_run_until_ready (TpChannel *self, diff --git a/telepathy-glib/channel.h b/telepathy-glib/channel.h index e8751ae01..1da6ca185 100644 --- a/telepathy-glib/channel.h +++ b/telepathy-glib/channel.h @@ -23,6 +23,7 @@ #define __TP_CHANNEL_H__ #include <telepathy-glib/connection.h> +#include <telepathy-glib/defs.h> #include <telepathy-glib/enums.h> #include <telepathy-glib/handle.h> #include <telepathy-glib/intset.h> @@ -80,8 +81,10 @@ TpChannel *tp_channel_new_from_properties (TpConnection *conn, const gchar *object_path, const GHashTable *immutable_properties, GError **error) G_GNUC_WARN_UNUSED_RESULT; +#ifndef TP_DISABLE_DEPRECATED gboolean tp_channel_run_until_ready (TpChannel *self, GError **error, - GMainLoop **loop); + GMainLoop **loop) _TP_GNUC_DEPRECATED; +#endif typedef void (*TpChannelWhenReadyCb) (TpChannel *channel, const GError *error, gpointer user_data); |