Mercurial > pidgin.yaz
changeset 13981:91a4cc3ee221
[gaim-migrate @ 16548]
Minor cleanup
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 23 Jul 2006 18:57:08 +0000 |
| parents | c9509bd42d7a |
| children | 052aee037835 |
| files | src/conversation.c src/protocols/jabber/jabber.c src/protocols/jabber/message.c src/protocols/simple/simple.c |
| diffstat | 4 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Sun Jul 23 02:03:19 2006 +0000 +++ b/src/conversation.c Sun Jul 23 18:57:08 2006 +0000 @@ -1440,7 +1440,7 @@ g_list_free(flags2); } -int +static int gaim_conv_chat_cb_compare(GaimConvChatBuddy *a, GaimConvChatBuddy *b) { GaimConvChatBuddyFlags f1 = 0, f2 = 0;
--- a/src/protocols/jabber/jabber.c Sun Jul 23 02:03:19 2006 +0000 +++ b/src/protocols/jabber/jabber.c Sun Jul 23 18:57:08 2006 +0000 @@ -370,7 +370,7 @@ int len; static char buf[4096]; - if(!g_list_find(gaim_connections_get_all(), gc)) + if(!GAIM_CONNECTION_IS_VALID(gc)) return; if((len = read(js->fd, buf, sizeof(buf) - 1)) > 0) { @@ -486,7 +486,7 @@ JabberStream *js; gc = data; - if (!g_list_find(gaim_connections_get_all(), gc)) + if (!GAIM_CONNECTION_IS_VALID(gc)) { /* This connection has been closed */ g_free(resp); @@ -500,7 +500,7 @@ g_free(resp); } else { jabber_login_connect(js, js->user->domain, - gaim_account_get_int(js->gc->account, "port", 0)); + gaim_account_get_int(js->gc->account, "port", 5222)); } }
--- a/src/protocols/jabber/message.c Sun Jul 23 02:03:19 2006 +0000 +++ b/src/protocols/jabber/message.c Sun Jul 23 18:57:08 2006 +0000 @@ -245,9 +245,6 @@ const char *type; xmlnode *child; - if(strcmp(packet->name, "message")) - return; - jm = g_new0(JabberMessage, 1); jm->js = js; jm->sent = time(NULL);
--- a/src/protocols/simple/simple.c Sun Jul 23 02:03:19 2006 +0000 +++ b/src/protocols/simple/simple.c Sun Jul 23 18:57:08 2006 +0000 @@ -1535,7 +1535,7 @@ int port; gc = data; - if (!g_list_find(gaim_connections_get_all(), gc)) + if (!GAIM_CONNECTION_IS_VALID(gc)) { /* This connection has been closed */ g_free(resp);