Mercurial > pidgin.yaz
changeset 30622:d78a3f06b7a0
merge of '2e4b491ee89464d56b79db045bcef7f63fda6b97'
and 'fc7c355ab0d2fb25d82bfd4e3847128276915e28'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 15 Jun 2010 22:42:49 +0000 |
| parents | 92a5d4b38f21 (diff) 6943aec8cf61 (current diff) |
| children | 8cd8c26ea2f9 |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Tue Jun 15 17:12:48 2010 +0000 +++ b/libpurple/protocols/jabber/jabber.c Tue Jun 15 22:42:49 2010 +0000 @@ -543,6 +543,13 @@ int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len) { JabberStream *js = purple_connection_get_protocol_data(gc); + + g_return_val_if_fail(js != NULL, -1); + /* TODO: It's probably worthwhile to restrict this to when the account + * state is CONNECTED, but I can /almost/ envision reasons for wanting + * to do things during the connection process. + */ + jabber_send_raw(js, buf, len); return len; }