Mercurial > pidgin
comparison libpurple/protocols/jabber/presence.c @ 27495:c8390dc125c1
Use js->state to track whether the roster has been retrieved.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 07 Jun 2009 05:36:45 +0000 |
parents | 72bcdcb0629f |
children | 9a5a9a4e7626 |
comparison
equal
deleted
inserted
replaced
27494:93a41017dca9 | 27495:c8390dc125c1 |
---|---|
131 account = purple_connection_get_account(js->gc); | 131 account = purple_connection_get_account(js->gc); |
132 p = purple_account_get_presence(account); | 132 p = purple_account_get_presence(account); |
133 status = purple_presence_get_active_status(p); | 133 status = purple_presence_get_active_status(p); |
134 | 134 |
135 /* we don't want to send presence before we've gotten our roster */ | 135 /* we don't want to send presence before we've gotten our roster */ |
136 if(!js->roster_parsed) { | 136 if (js->state != JABBER_STREAM_CONNECTED) { |
137 purple_debug_info("jabber", "attempt to send presence before roster retrieved\n"); | 137 purple_debug_info("jabber", "attempt to send presence before roster retrieved\n"); |
138 return; | 138 return; |
139 } | 139 } |
140 | 140 |
141 purple_status_to_jabber(status, &state, &stripped, &priority); | 141 purple_status_to_jabber(status, &state, &stripped, &priority); |