diff options
author | Giovanni Campagna <scampa.giovanni@gmail.com> | 2015-03-03 00:09:05 -0800 |
---|---|---|
committer | Giovanni Campagna <scampa.giovanni@gmail.com> | 2015-03-03 14:20:48 -0800 |
commit | 38a2f26e44f4abb9828d486c4a9502eb0843996b (patch) | |
tree | 4e66758b8b70b9915c7df0eb5e9f4358e4128bcb /src | |
parent | 88cde2a97de7ee7422b117ef0fd0a8a37c870f58 (diff) | |
download | gnome-shell-38a2f26e44f4abb9828d486c4a9502eb0843996b.tar.gz |
TelepathyClient: remove subscription request notifications
The ones handled by empathy are just fine
https://bugzilla.gnome.org/show_bug.cgi?id=745503
Diffstat (limited to 'src')
-rw-r--r-- | src/shell-tp-client.c | 58 | ||||
-rw-r--r-- | src/shell-tp-client.h | 14 |
2 files changed, 0 insertions, 72 deletions
diff --git a/src/shell-tp-client.c b/src/shell-tp-client.c index 400b8296e..817700e57 100644 --- a/src/shell-tp-client.c +++ b/src/shell-tp-client.c @@ -21,10 +21,6 @@ struct _ShellTpClientPrivate ShellTpClientHandleChannelsImpl handle_channels_impl; gpointer user_data_handle_channels; GDestroyNotify destroy_handle_channels; - - ShellTpClientContactListChangedImpl contact_list_changed_impl; - gpointer user_data_contact_list_changed; - GDestroyNotify destroy_contact_list_changed; }; /** @@ -83,16 +79,6 @@ struct _ShellTpClientPrivate * Signature of the implementation of the HandleChannels method. */ -/** - * ShellTpClientContactListChangedImpl: - * @connection: a #TpConnection having %TP_CONNECTION_FEATURE_CORE prepared - * if possible - * @added: (element-type TelepathyGLib.Contact): a #GPtrArray of added #TpContact - * @removed: (element-type TelepathyGLib.Contact): a #GPtrArray of removed #TpContact - * - * Signature of the implementation of the ContactListChanged method. - */ - static void shell_tp_client_init (ShellTpClient *self) { @@ -226,13 +212,6 @@ shell_tp_client_dispose (GObject *object) self->priv->user_data_handle_channels = NULL; } - if (self->priv->destroy_contact_list_changed != NULL) - { - self->priv->destroy_contact_list_changed (self->priv->user_data_contact_list_changed); - self->priv->destroy_contact_list_changed = NULL; - self->priv->user_data_contact_list_changed = NULL; - } - if (dispose != NULL) dispose (object); } @@ -290,40 +269,3 @@ shell_tp_client_set_handle_channels_func (ShellTpClient *self, self->priv->user_data_handle_channels = user_data; self->priv->destroy_handle_channels = destroy; } - -void -shell_tp_client_set_contact_list_changed_func (ShellTpClient *self, - ShellTpClientContactListChangedImpl contact_list_changed_impl, - gpointer user_data, - GDestroyNotify destroy) -{ - g_assert (self->priv->contact_list_changed_impl == NULL); - - self->priv->contact_list_changed_impl = contact_list_changed_impl; - self->priv->user_data_handle_channels = user_data; - self->priv->destroy_handle_channels = destroy; -} - -static void -on_contact_list_changed (TpConnection *conn, - GPtrArray *added, - GPtrArray *removed, - gpointer user_data) -{ - ShellTpClient *self = (ShellTpClient *) user_data; - - g_assert (self->priv->contact_list_changed_impl != NULL); - - self->priv->contact_list_changed_impl (conn, - added, removed, - self->priv->user_data_contact_list_changed); -} - -void -shell_tp_client_grab_contact_list_changed (ShellTpClient *self, - TpConnection *conn) -{ - g_signal_connect (conn, "contact-list-changed", - G_CALLBACK (on_contact_list_changed), - self); -} diff --git a/src/shell-tp-client.h b/src/shell-tp-client.h index 107bcb46a..15bcf75e7 100644 --- a/src/shell-tp-client.h +++ b/src/shell-tp-client.h @@ -86,19 +86,5 @@ void shell_tp_client_set_handle_channels_func (ShellTpClient *self, gpointer user_data, GDestroyNotify destroy); -typedef void (*ShellTpClientContactListChangedImpl) ( - TpConnection *connection, - GPtrArray *added, - GPtrArray *removed, - gpointer user_data); - -void shell_tp_client_set_contact_list_changed_func (ShellTpClient *self, - ShellTpClientContactListChangedImpl contact_list_changed_impl, - gpointer user_data, - GDestroyNotify destroy); - -void shell_tp_client_grab_contact_list_changed (ShellTpClient *self, - TpConnection *conn); - G_END_DECLS #endif /* __SHELL_TP_CLIENT_H__ */ |