[Telepathy-commits] [telepathy-mission-control/master] Don't copy requestor data

[Alberto Mardegan]

When we find that the requested channel already exists, don't copy the new
requestor data onto it.
This is simply because the requestor-serial property is deprecated, but indeed
all this code should be refactored.
---
 src/mcd-connection.c |   17 +++--------------
 1 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 3d0bf01..be402f9 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -2153,21 +2153,10 @@ request_handles_cb (TpConnection *proxy, const GArray *handles,
 	    chan_handle_type == mcd_channel_get_handle_type (existing_channel) &&
 	    chan_type == mcd_channel_get_channel_type_quark (existing_channel))
 	{
-	    guint requestor_serial;
-	    gchar *requestor_client_id;
-
 	    g_debug ("%s: Channel already existing, returning old one", G_STRFUNC);
-	    /* we retrieve the information we need from the newly created
-	     * channel object and set them to the "old" channel */
-	    g_object_get (channel,
-			  "requestor-serial", &requestor_serial,
-			  "requestor-client-id", &requestor_client_id,
-			  NULL);
-	    g_object_set (existing_channel,
-			  "requestor-serial", requestor_serial,
-			  "requestor-client-id", requestor_client_id,
-			  NULL);
-	    g_free (requestor_client_id);
+            /* FIXME: this situation is weird. We should have checked for the
+             * existance of the channel _before_ getting here, already when
+             * creating the request */
 	    /* we no longer need the new channel */
 	    g_object_unref (channel);
 	    /* notify the dispatcher again */
-- 
1.5.6.5