telepathy-mission-control: mcd_channel_get_members_accepted and members-accepted signal: remove

[Simon McVittie]

Module: telepathy-mission-control
Branch: master
Commit: 6c4526da85db2e963a602776f34de659362d90aa
URL:    http://cgit.freedesktop.org/telepathy/telepathy-mission-control/commit/?id=6c4526da85db2e963a602776f34de659362d90aa

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue May  8 13:28:07 2012 +0100

mcd_channel_get_members_accepted and members-accepted signal: remove

---

 src/mcd-channel.c |   25 -------------------------
 src/mcd-channel.h |    3 +--
 2 files changed, 1 insertions(+), 27 deletions(-)

diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index 7ae6e93..7f5017f 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -68,7 +68,6 @@ struct _McdChannelPrivate
     /* boolean properties */
     guint outgoing : 1;
     guint has_group_if : 1;
-    guint members_accepted : 1;
     guint is_disposed : 1;
     guint is_aborted : 1;
     guint constructing : 1;
@@ -116,7 +115,6 @@ on_members_changed (TpChannel *proxy, const gchar *message,
 		    const GArray *l_pending, const GArray *r_pending,
                     guint actor, guint reason, McdChannel *channel)
 {
-    McdChannelPrivate *priv = channel->priv;
     TpHandle self_handle;
     TpHandle conn_self_handle = 0;
     TpHandle removed_handle = 0;
@@ -137,15 +135,6 @@ on_members_changed (TpChannel *proxy, const gchar *message,
 	{
 	    guint added_member = g_array_index (added, guint, i);
             DEBUG ("added member %u", added_member);
-
-            /* see whether we are the added member */
-            if (added_member == self_handle)
-            {
-                DEBUG ("This should appear only when the call was accepted");
-                priv->members_accepted = TRUE;
-                g_signal_emit_by_name (channel, "members-accepted");
-                break;
-            }
 	}
     }
 
@@ -595,14 +584,6 @@ mcd_channel_class_init (McdChannelClass * klass)
 				       status_changed_signal),
 		      NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE,
 		      1, G_TYPE_INT);
-    mcd_channel_signals[MEMBERS_ACCEPTED] =
-	g_signal_new ("members-accepted", G_OBJECT_CLASS_TYPE (klass),
-		      G_SIGNAL_RUN_FIRST,
-		      G_STRUCT_OFFSET (McdChannelClass,
-				       members_accepted_signal),
-		      NULL,
-		      NULL, g_cclosure_marshal_VOID__VOID,
-		      G_TYPE_NONE, 0);
 
     /* properties */
     g_object_class_install_property
@@ -828,12 +809,6 @@ mcd_channel_get_status (McdChannel *channel)
     return MCD_CHANNEL_PRIV (channel)->status;
 }
 
-gboolean
-mcd_channel_get_members_accepted (McdChannel *channel)
-{
-    return MCD_CHANNEL_PRIV (channel)->members_accepted;
-}
-
 const gchar *
 mcd_channel_get_channel_type (McdChannel *channel)
 {
diff --git a/src/mcd-channel.h b/src/mcd-channel.h
index 1678126..e67e7dd 100644
--- a/src/mcd-channel.h
+++ b/src/mcd-channel.h
@@ -80,7 +80,7 @@ struct _McdChannelClass
     /* signals */
     void (*status_changed_signal) (McdChannel * channel,
 				   McdChannelStatus status);
-    void (*members_accepted_signal) (McdChannel *channel);
+    void (*_former_members_accepted_signal) (void);
     TpDBusPropertiesMixinClass _former_dbus_properties_class;
     void (*_mc_reserved1) (void);
     void (*_mc_reserved2) (void);
@@ -101,7 +101,6 @@ McdChannel *mcd_channel_new_from_path (TpConnection *connection,
                                        TpHandleType handle_type);
 
 McdChannelStatus mcd_channel_get_status (McdChannel * channel);
-gboolean mcd_channel_get_members_accepted (McdChannel *channel);
 const gchar* mcd_channel_get_channel_type (McdChannel *channel);
 GQuark mcd_channel_get_channel_type_quark (McdChannel *channel);
 const gchar* mcd_channel_get_object_path (McdChannel *channel);