Silent warning about some used deprecated symbols

3 files changed, 8 insertions, 2 deletions

diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index 1af096a9b..6d9d6d87b 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -724,9 +724,11 @@ tp_channel_chat_state_changed_cb (TpChannel *self,
   g_hash_table_insert (self->priv->chat_states,
       GUINT_TO_POINTER (contact), GUINT_TO_POINTER (state));
 
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   /* Don't emit the signal until we've had the initial state */
   if (!tp_proxy_is_prepared (self, TP_CHANNEL_FEATURE_CHAT_STATES))
     return;
+  G_GNUC_END_IGNORE_DEPRECATIONS
 
   g_signal_emit (self, signals[SIGNAL_CHAT_STATE_CHANGED], 0, contact, state);
 }
@@ -1503,11 +1505,13 @@ tp_channel_list_features (TpProxyClass *cls G_GNUC_UNUSED)
   features[FEAT_CONTACTS].prepare_async =
     _tp_channel_contacts_prepare_async;
 
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   features[FEAT_CHAT_STATES].name = TP_CHANNEL_FEATURE_CHAT_STATES;
   features[FEAT_CHAT_STATES].prepare_async =
     tp_channel_prepare_chat_states_async;
   need_chat_states[0] = TP_IFACE_QUARK_CHANNEL_INTERFACE_CHAT_STATE;
   features[FEAT_CHAT_STATES].interfaces_needed = need_chat_states;
+  G_GNUC_END_IGNORE_DEPRECATIONS
 
   features[FEAT_PASSWORD].name = TP_CHANNEL_FEATURE_PASSWORD;
   features[FEAT_PASSWORD].prepare_async =
diff --git a/telepathy-glib/message-mixin.c b/telepathy-glib/message-mixin.c
index 696bd441d..6562c6e58 100644
--- a/telepathy-glib/message-mixin.c
+++ b/telepathy-glib/message-mixin.c
@@ -466,7 +466,7 @@ tp_message_mixin_set_chat_state_async (TpSvcChannelInterfaceChatState *iface,
     {
       DEBUG ("invalid chat state %u", state);
 
-      g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "invalid state: %u", state);
       goto error;
     }
@@ -476,7 +476,7 @@ tp_message_mixin_set_chat_state_async (TpSvcChannelInterfaceChatState *iface,
       /* We cannot explicitly set the Gone state */
       DEBUG ("you may not explicitly set the Gone state");
 
-      g_set_error (&error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+      g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "you may not explicitly set the Gone state");
       goto error;
     }
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index 3c63b8da2..24c49afb7 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -870,12 +870,14 @@ tp_text_channel_list_features (TpProxyClass *cls G_GNUC_UNUSED)
   need_sms[0] = TP_IFACE_QUARK_CHANNEL_INTERFACE_SMS;
   features[FEAT_SMS].interfaces_needed = need_sms;
 
+  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   features[FEAT_CHAT_STATES].name =
     TP_TEXT_CHANNEL_FEATURE_CHAT_STATES;
   features[FEAT_CHAT_STATES].prepare_async =
     tp_text_channel_prepare_chat_states_async;
   depends_chat_state[0] = TP_CHANNEL_FEATURE_CHAT_STATES;
   features[FEAT_CHAT_STATES].depends_on = depends_chat_state;
+  G_GNUC_END_IGNORE_DEPRECATIONS
 
   /* assert that the terminator at the end is there */
   g_assert (features[N_FEAT].name == 0);