From 39439b80f5d1574e67f337a047869cf067c396b7 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 14 Jan 2013 23:42:06 +0100
Subject: Client: rebase on the new BufferedSocket class

---
 src/ClientExpire.cxx | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'src/ClientExpire.cxx')

diff --git a/src/ClientExpire.cxx b/src/ClientExpire.cxx
index f599e472..56b003df 100644
--- a/src/ClientExpire.cxx
+++ b/src/ClientExpire.cxx
@@ -26,18 +26,11 @@ static guint expire_source_id;
 void
 Client::SetExpired()
 {
-	if (!IsExpired())
-		client_schedule_expire();
+	if (IsExpired())
+		return;
 
-	if (source_id != 0) {
-		g_source_remove(source_id);
-		source_id = 0;
-	}
-
-	if (channel != NULL) {
-		g_io_channel_unref(channel);
-		channel = nullptr;
-	}
+	client_schedule_expire();
+	BufferedSocket::Close();
 }
 
 static void
-- 
cgit v1.2.3