[next] telepathy-glib: channel-manager: remove _emit_new_channels
Jonny Lamb
jonny at kemper.freedesktop.org
Fri May 11 02:57:16 PDT 2012
Module: telepathy-glib
Branch: next
Commit: c09db131c4e2df68e269940f03772a0e99241b82
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=c09db131c4e2df68e269940f03772a0e99241b82
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date: Fri May 11 10:42:33 2012 +0100
channel-manager: remove _emit_new_channels
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47942
Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
docs/reference/telepathy-glib-sections.txt | 1 -
telepathy-glib/channel-manager.c | 35 ----------------------------
telepathy-glib/channel-manager.h | 4 ---
3 files changed, 0 insertions(+), 40 deletions(-)
diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index c6186fc..66b4141 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -116,7 +116,6 @@ tp_channel_manager_create_channel
tp_channel_manager_emit_channel_closed
tp_channel_manager_emit_channel_closed_for_object
tp_channel_manager_emit_new_channel
-tp_channel_manager_emit_new_channels
tp_channel_manager_emit_request_already_satisfied
tp_channel_manager_emit_request_failed
tp_channel_manager_emit_request_failed_printf
diff --git a/telepathy-glib/channel-manager.c b/telepathy-glib/channel-manager.c
index da24493..7961070 100644
--- a/telepathy-glib/channel-manager.c
+++ b/telepathy-glib/channel-manager.c
@@ -343,41 +343,6 @@ tp_channel_manager_get_type (void)
/* Signal emission wrappers */
-
-/**
- * tp_channel_manager_emit_new_channels:
- * @instance: An object implementing #TpChannelManager
- * @channels: a #GHashTable where the keys are
- * #TpExportableChannel instances (hashed and compared
- * by g_direct_hash() and g_direct_equal()) and the values are
- * linked lists (#GSList) of request tokens (opaque pointers) satisfied by
- * these channels
- *
- * If @channels is non-empty, emit the #TpChannelManager::new-channels
- * signal indicating that those channels have been created.
- *
- * Deprecated: in 0.UNRELEASED this function should not be
- * used. Signalling the creation of multiple channels together in a
- * single signal is strongly recommended against as it's very
- * complicated, hard to get right in clients, and not nearly as
- * useful as it originally sounded. Use
- * tp_channel_manager_emit_new_channel() instead.
- *
- * Since: 0.7.15
- */
-void
-tp_channel_manager_emit_new_channels (gpointer instance,
- GHashTable *channels)
-{
- g_return_if_fail (TP_IS_CHANNEL_MANAGER (instance));
-
- if (g_hash_table_size (channels) == 0)
- return;
-
- g_signal_emit (instance, signals[S_NEW_CHANNELS], 0, channels);
-}
-
-
/**
* tp_channel_manager_emit_new_channel:
* @instance: An object implementing #TpChannelManager
diff --git a/telepathy-glib/channel-manager.h b/telepathy-glib/channel-manager.h
index 7b2f64d..72bcb56 100644
--- a/telepathy-glib/channel-manager.h
+++ b/telepathy-glib/channel-manager.h
@@ -131,10 +131,6 @@ GType tp_channel_manager_get_type (void);
void tp_channel_manager_emit_new_channel (gpointer instance,
TpExportableChannel *channel, GSList *request_tokens);
-_TP_DEPRECATED_IN_UNRELEASED
-void tp_channel_manager_emit_new_channels (gpointer instance,
- GHashTable *channels);
-
void tp_channel_manager_emit_channel_closed (gpointer instance,
const gchar *path);
void tp_channel_manager_emit_channel_closed_for_object (gpointer instance,
More information about the telepathy-commits
mailing list