Revision: 16549
Author: thekingant
Date: 2006-07-23 11:57:28 -0700 (Sun, 23 Jul 2006)
ViewCVS: http://svn.sourceforge.net/gaim/?rev=16549&view=rev
Log Message:
-----------
Backport SVN revision #16548 from HEAD to v2_0_0
Original commit message:
Minor cleanup
ViewCVS Links:
-------------
http://svn.sourceforge.net/gaim/?rev=16548&view=rev
Modified Paths:
--------------
branches/v2_0_0/src/protocols/jabber/jabber.c
branches/v2_0_0/src/protocols/jabber/message.c
branches/v2_0_0/src/protocols/simple/simple.c
Modified: branches/v2_0_0/src/protocols/jabber/jabber.c
===================================================================
--- branches/v2_0_0/src/protocols/jabber/jabber.c 2006-07-23 18:57:08 UTC (rev 16548)
+++ branches/v2_0_0/src/protocols/jabber/jabber.c 2006-07-23 18:57:28 UTC (rev 16549)
@@ -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));
}
}
Modified: branches/v2_0_0/src/protocols/jabber/message.c
===================================================================
--- branches/v2_0_0/src/protocols/jabber/message.c 2006-07-23 18:57:08 UTC (rev 16548)
+++ branches/v2_0_0/src/protocols/jabber/message.c 2006-07-23 18:57:28 UTC (rev 16549)
@@ -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);
Modified: branches/v2_0_0/src/protocols/simple/simple.c
===================================================================
--- branches/v2_0_0/src/protocols/simple/simple.c 2006-07-23 18:57:08 UTC (rev 16548)
+++ branches/v2_0_0/src/protocols/simple/simple.c 2006-07-23 18:57:28 UTC (rev 16549)
@@ -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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
