Mercurial > pidgin
changeset 23387:62651e80be28
merge of '7d9bc7a7d232a2b83e7923d0d5d20be09ed1fc5c'
and 'c5c25b1bb0dd4164db9232f426de3aa6055593bd'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 26 Jun 2008 01:14:34 +0000 |
| parents | cc1d617308ad (diff) e04908f3f649 (current diff) |
| children | 276925996951 |
| files | |
| diffstat | 3 files changed, 31 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/idle.c Wed Jun 25 21:31:31 2008 +0000 +++ b/libpurple/idle.c Thu Jun 26 01:14:34 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
--- a/libpurple/protocols/silc/buddy.c Wed Jun 25 21:31:31 2008 +0000 +++ b/libpurple/protocols/silc/buddy.c Thu Jun 26 01:14:34 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),
--- a/libpurple/protocols/silc10/buddy.c Wed Jun 25 21:31:31 2008 +0000 +++ b/libpurple/protocols/silc10/buddy.c Thu Jun 26 01:14:34 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),