[Telepathy-commits] [telepathy-gabble/master] Closing tubes: Replace "local" parameter by "!closed_remotely".

[Alban Crequy]

---
 src/tube-dbus.c     |    5 +++--
 src/tube-iface.c    |    4 ++--
 src/tube-iface.h    |    4 ++--
 src/tube-stream.c   |    4 ++--
 src/tubes-channel.c |   12 ++++++------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index ec81f3a..c6e7a17 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -134,7 +134,8 @@ struct _GabbleTubeDBusPrivate
 static void data_received_cb (GabbleBytestreamIface *stream, TpHandle sender,
     GString *data, gpointer user_data);
 
-static void gabble_tube_dbus_close (GabbleTubeIface *tube, gboolean local);
+static void gabble_tube_dbus_close (GabbleTubeIface *tube, gboolean
+    closed_remotely);
 
 /*
  * Characters used are permissible both in filenames and in D-Bus names. (See
@@ -1165,7 +1166,7 @@ gabble_tube_dbus_accept (GabbleTubeIface *tube,
  * Implements gabble_tube_iface_close on GabbleTubeIface
  */
 static void
-gabble_tube_dbus_close (GabbleTubeIface *tube, gboolean local)
+gabble_tube_dbus_close (GabbleTubeIface *tube, gboolean closed_remotely)
 {
   GabbleTubeDBus *self = GABBLE_TUBE_DBUS (tube);
 
diff --git a/src/tube-iface.c b/src/tube-iface.c
index e1c3cf0..bab52e4 100644
--- a/src/tube-iface.c
+++ b/src/tube-iface.c
@@ -33,12 +33,12 @@ gabble_tube_iface_accept (GabbleTubeIface *self,
 }
 
 void
-gabble_tube_iface_close (GabbleTubeIface *self, gboolean local)
+gabble_tube_iface_close (GabbleTubeIface *self, gboolean closed_remotely)
 {
   void (*virtual_method)(GabbleTubeIface *, gboolean) =
     GABBLE_TUBE_IFACE_GET_CLASS (self)->close;
   g_assert (virtual_method != NULL);
-  virtual_method (self, local);
+  virtual_method (self, closed_remotely);
 }
 
 void
diff --git a/src/tube-iface.h b/src/tube-iface.h
index b4496a6..5800071 100644
--- a/src/tube-iface.h
+++ b/src/tube-iface.h
@@ -33,7 +33,7 @@ struct _GabbleTubeIfaceClass {
   GTypeInterface parent;
 
   gboolean (*accept) (GabbleTubeIface *tube, GError **error);
-  void (*close) (GabbleTubeIface *tube, gboolean local);
+  void (*close) (GabbleTubeIface *tube, gboolean closed_remotely);
   void (*add_bytestream) (GabbleTubeIface *tube,
       GabbleBytestreamIface *bytestream);
 };
@@ -53,7 +53,7 @@ GType gabble_tube_iface_get_type (void);
 
 gboolean gabble_tube_iface_accept (GabbleTubeIface *tube, GError **error);
 
-void gabble_tube_iface_close (GabbleTubeIface *tube, gboolean local);
+void gabble_tube_iface_close (GabbleTubeIface *tube, gboolean closed_remotely);
 
 void gabble_tube_iface_add_bytestream (GabbleTubeIface *tube,
     GabbleBytestreamIface *bytestream);
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 2bc1278..ec7707d 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -1304,7 +1304,7 @@ gabble_tube_stream_accept (GabbleTubeIface *tube,
  * Implements gabble_tube_iface_close on GabbleTubeIface
  */
 static void
-gabble_tube_stream_close (GabbleTubeIface *tube, gboolean local)
+gabble_tube_stream_close (GabbleTubeIface *tube, gboolean closed_remotely)
 {
   GabbleTubeStream *self = GABBLE_TUBE_STREAM (tube);
   GabbleTubeStreamPrivate *priv = GABBLE_TUBE_STREAM_GET_PRIVATE (self);
@@ -1316,7 +1316,7 @@ gabble_tube_stream_close (GabbleTubeIface *tube, gboolean local)
   g_hash_table_foreach_remove (priv->fd_to_bytestreams,
       close_each_extra_bytestream, self);
 
-  if (local && priv->handle_type == TP_HANDLE_TYPE_CONTACT)
+  if (!closed_remotely && priv->handle_type == TP_HANDLE_TYPE_CONTACT)
     {
       LmMessage *msg;
       const gchar *jid;
diff --git a/src/tubes-channel.c b/src/tubes-channel.c
index 7a0ef16..21b11cb 100644
--- a/src/tubes-channel.c
+++ b/src/tubes-channel.c
@@ -1182,7 +1182,7 @@ bytestream_negotiate_cb (GabbleBytestreamIface *bytestream,
   if (bytestream == NULL)
     {
       /* Tube was declined by remote user. Close it */
-      gabble_tube_iface_close (tube, FALSE);
+      gabble_tube_iface_close (tube, TRUE);
       return;
     }
 
@@ -1576,7 +1576,7 @@ tube_msg_offered (GabbleTubesChannel *self,
     {
       DEBUG ("tube ID already in use. Do not open the offered tube and close "
           "the existing tube id %u", tube_id);
-      gabble_tube_iface_close (tube, TRUE);
+      gabble_tube_iface_close (tube, FALSE);
       return;
     }
 
@@ -1645,7 +1645,7 @@ tube_msg_close (GabbleTubesChannel *self,
     }
 
   DEBUG ("tube %u was closed by remote peer", tube_id);
-  gabble_tube_iface_close (tube, FALSE);
+  gabble_tube_iface_close (tube, TRUE);
 }
 
 void
@@ -1722,7 +1722,7 @@ gabble_tubes_channel_offer_d_bus_tube (TpSvcChannelTypeTubes *iface,
 
       if (!start_stream_initiation (self, tube, stream_id, &error))
         {
-          gabble_tube_iface_close (tube, FALSE);
+          gabble_tube_iface_close (tube, TRUE);
 
           dbus_g_method_return_error (context, error);
 
@@ -1823,7 +1823,7 @@ gabble_tubes_channel_offer_stream_tube (TpSvcChannelTypeTubes *iface,
       /* Stream initiation */
       if (!send_new_stream_tube_msg (self, tube, stream_id, &error))
         {
-          gabble_tube_iface_close (tube, FALSE);
+          gabble_tube_iface_close (tube, TRUE);
 
           dbus_g_method_return_error (context, error);
 
@@ -2053,7 +2053,7 @@ gabble_tubes_channel_close_tube (TpSvcChannelTypeTubes *iface,
       return;
     }
 
-  gabble_tube_iface_close (tube, TRUE);
+  gabble_tube_iface_close (tube, FALSE);
 
   tp_svc_channel_type_tubes_return_from_close_tube (context);
 }
-- 
1.5.6.5