# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1214443085 0
# Node ID d74ff4f23171794deb8787ddc35b453b3022a7b1
# Parent  6609b82b999d14c2a18dc004cbf7cef0d098b987
applied changes from 7f7111ed9e5924db9e740ad354fce8fb82445b1e
             through 7d9bc7a7d232a2b83e7923d0d5d20be09ed1fc5c

diff -r 6609b82b999d -r d74ff4f23171 libpurple/idle.c
--- a/libpurple/idle.c	Thu Jun 26 01:17:25 2008 +0000
+++ b/libpurple/idle.c	Thu Jun 26 01:18:05 2008 +0000
@@ -252,7 +252,7 @@
 	PurpleAccount *account;
 
 	account = purple_connection_get_account(gc);
-	idled_accts = g_list_remove(idled_accts, account);
+	set_account_unidle(account);
 }
 
 static void
diff -r 6609b82b999d -r d74ff4f23171 libpurple/protocols/silc/buddy.c
--- a/libpurple/protocols/silc/buddy.c	Thu Jun 26 01:17:25 2008 +0000
+++ b/libpurple/protocols/silc/buddy.c	Thu Jun 26 01:18:05 2008 +0000
@@ -1434,13 +1434,25 @@
 void silcpurple_idle_set(PurpleConnection *gc, int idle)
 
 {
-	SilcPurple sg = gc->proto_data;
-	SilcClient client = sg->client;
-	SilcClientConnection conn = sg->conn;
+	SilcPurple sg;
+	SilcClient client;
+	SilcClientConnection conn;
 	SilcAttributeObjService service;
 	const char *server;
 	int port;
 
+	sg = gc->proto_data;
+	if (sg == NULL)
+		return;
+
+	client = sg->client;
+	if (client == NULL)
+		return;
+
+	conn = sg->conn;
+	if (conn == NULL)
+		return;
+
 	server = purple_account_get_string(sg->account, "server",
 					 "silc.silcnet.org");
 	port = purple_account_get_int(sg->account, "port", 706),
diff -r 6609b82b999d -r d74ff4f23171 libpurple/protocols/silc10/buddy.c
--- a/libpurple/protocols/silc10/buddy.c	Thu Jun 26 01:17:25 2008 +0000
+++ b/libpurple/protocols/silc10/buddy.c	Thu Jun 26 01:18:05 2008 +0000
@@ -1434,13 +1434,25 @@
 void silcpurple_idle_set(PurpleConnection *gc, int idle)
 
 {
-	SilcPurple sg = gc->proto_data;
-	SilcClient client = sg->client;
-	SilcClientConnection conn = sg->conn;
+	SilcPurple sg;
+	SilcClient client;
+	SilcClientConnection conn;
 	SilcAttributeObjService service;
 	const char *server;
 	int port;
 
+	sg = gc->proto_data;
+	if (sg == NULL)
+		return;
+
+	client = sg->client;
+	if (client == NULL)
+		return;
+
+	conn = sg->conn;
+	if (conn == NULL)
+		return;
+
 	server = purple_account_get_string(sg->account, "server",
 					 "silc.silcnet.org");
 	port = purple_account_get_int(sg->account, "port", 706),