[telepathy-mission-control/master] Remove mcd_connection_set_reconnect (unused)

Simon McVittie simon.mcvittie at collabora.co.uk
Wed Apr 8 08:20:20 PDT 2009


---
 src/mcd-connection.c |   26 +++-----------------------
 src/mcd-connection.h |    3 ---
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index fa3e128..762df6c 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -121,8 +121,6 @@ struct _McdConnectionPrivate
     /* FALSE until we got the first PresencesChanged for the self handle */
     guint got_presences_changed : 1;
 
-    guint auto_reconnect : 1;
-
     gchar *alias;
 
     gboolean is_disposed;
@@ -1133,10 +1131,9 @@ static void proxy_destroyed (DBusGProxy *tp_conn, guint domain, gint code,
 	priv->capabilities_timer = 0;
     }
 
-    if (priv->auto_reconnect &&
-        (priv->abort_reason == TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED ||
-         priv->abort_reason == TP_CONNECTION_STATUS_REASON_NETWORK_ERROR ||
-         priv->abort_reason == TP_CONNECTION_STATUS_REASON_NAME_IN_USE))
+    if (priv->abort_reason == TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED ||
+        priv->abort_reason == TP_CONNECTION_STATUS_REASON_NETWORK_ERROR ||
+        priv->abort_reason == TP_CONNECTION_STATUS_REASON_NAME_IN_USE)
     {
         /* we were disconnected by a network error or by a connection manager
          * crash (in the latter case, we get NoneSpecified as a reason): don't
@@ -1952,7 +1949,6 @@ mcd_connection_init (McdConnection * connection)
     priv->abort_reason = TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED;
 
     priv->reconnect_interval = INITIAL_RECONNECTION_TIME;
-    priv->auto_reconnect = TRUE;
 }
 
 /* Public methods */
@@ -2486,22 +2482,6 @@ mcd_connection_get_name (McdConnection *connection)
 }
 
 /**
- * mcd_connection_set_reconnect:
- * @connection: the #McdConnection.
- * @reconnect: %TRUE to activate auto-reconnection, %FALSE otherwise.
- *
- * Enable/disable the automatic reconnection behaviour on connection lost.
- * By default automatic reconnection is enabled.
- */
-void
-mcd_connection_set_reconnect (McdConnection *connection, gboolean reconnect)
-{
-    g_return_if_fail (MCD_IS_CONNECTION (connection));
-
-    connection->priv->auto_reconnect = reconnect;
-}
-
-/**
  * _mcd_connection_update_property:
  * @connection: the #McdConnection.
  * @name: the qualified name of the property to be updated.
diff --git a/src/mcd-connection.h b/src/mcd-connection.h
index c8c56fe..6810331 100644
--- a/src/mcd-connection.h
+++ b/src/mcd-connection.h
@@ -88,9 +88,6 @@ gboolean mcd_connection_cancel_channel_request (McdConnection *connection,
 						const gchar *requestor_client_id,
 					       	GError **error);
 
-void mcd_connection_set_reconnect (McdConnection *connection,
-                                   gboolean reconnect);
-
 void mcd_connection_connect (McdConnection *connection, GHashTable *params);
 void mcd_connection_close (McdConnection *connection);
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list