[Telepathy-commits] [telepathy-mission-control/master] Remove unused parameter.

[Alberto Mardegan]

The error parameter is not useful, as errors are stored in the McdChannel
itself.
---
 src/mcd-account-compat.c   |    3 +--
 src/mcd-account-requests.c |    2 +-
 src/mcd-connection.c       |    7 +++----
 src/mcd-connection.h       |    3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/mcd-account-compat.c b/src/mcd-account-compat.c
index 7bbe127..340e94f 100644
--- a/src/mcd-account-compat.c
+++ b/src/mcd-account-compat.c
@@ -240,7 +240,6 @@ process_channel_request (McdAccount *account, gpointer userdata,
 {
     McdChannel *channel = MCD_CHANNEL (userdata);
     McdConnection *connection;
-    GError *err = NULL;
 
     if (error)
     {
@@ -255,7 +254,7 @@ process_channel_request (McdAccount *account, gpointer userdata,
     g_return_if_fail (mcd_connection_get_connection_status (connection)
                       == TP_CONNECTION_STATUS_CONNECTED);
 
-    mcd_connection_request_channel (connection, channel, &err);
+    mcd_connection_request_channel (connection, channel);
 }
 
 static void
diff --git a/src/mcd-account-requests.c b/src/mcd-account-requests.c
index 281e3cd..373bb05 100644
--- a/src/mcd-account-requests.c
+++ b/src/mcd-account-requests.c
@@ -91,7 +91,7 @@ online_request_cb (McdAccount *account, gpointer userdata, const GError *error)
     /* the connection will take ownership of the channel, so let's keep a
      * reference to it to make sure it's not destroyed while we are using it */
     g_object_ref (channel);
-    mcd_connection_request_channel (connection, channel, NULL);
+    mcd_connection_request_channel (connection, channel);
 }
 
 static void
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index e0239d6..980eab0 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -1266,7 +1266,7 @@ request_unrequested_channels (McdConnection *connection)
         if (mcd_channel_get_status (channel) == MCD_CHANNEL_REQUEST)
         {
             g_debug ("Requesting channel %p", channel);
-            mcd_connection_request_channel (connection, channel, NULL);
+            mcd_connection_request_channel (connection, channel);
         }
         channels = channels->next;
     }
@@ -2196,13 +2196,12 @@ request_handles_cb (TpConnection *proxy, const GArray *handles,
     mcd_channel_set_handle (channel, chan_handle);
 
     g_return_if_fail (chan_handle != 0);
-    mcd_connection_request_channel (connection, channel, NULL);
+    mcd_connection_request_channel (connection, channel);
 }
 
 gboolean
 mcd_connection_request_channel (McdConnection *connection,
-                                McdChannel *channel,
-			       	GError ** error)
+                                McdChannel *channel)
 {
     McdConnectionPrivate *priv = MCD_CONNECTION_PRIV (connection);
     guint channel_handle, channel_handle_type;
diff --git a/src/mcd-connection.h b/src/mcd-connection.h
index 9ced972..18b4855 100644
--- a/src/mcd-connection.h
+++ b/src/mcd-connection.h
@@ -74,8 +74,7 @@ TpConnectionStatus mcd_connection_get_connection_status (McdConnection *connecti
 TpConnectionStatusReason mcd_connection_get_connection_status_reason (McdConnection *connection);
 
 gboolean mcd_connection_request_channel (McdConnection *connection,
-					 McdChannel *channel,
-					 GError ** error);
+					 McdChannel *channel);
 
 gboolean mcd_connection_cancel_channel_request (McdConnection *connection,
 					       	guint operation_id,
-- 
1.5.6.5