comparison: libpurple/protocols/jabber/auth_cyrus.c
libpurple/protocols/jabber/auth_cyrus.c
- branch
- cpw.darkrain42.xmpp.scram
- changeset 28860
- d2a057cdd7b6
- parent 28859
- 42dff222ef5b
- child 28861
- b77599fa1e36
equal
deleted
inserted
replaced
| 28859:42dff222ef5b | 28860:d2a057cdd7b6 |
|---|---|
| 153 xmlnode_free(response); | 153 xmlnode_free(response); |
| 154 } | 154 } |
| 155 } | 155 } |
| 156 | 156 |
| 157 static void | 157 static void |
| 158 auth_no_pass_cb(PurpleConnection *conn, PurpleRequestFields *fields) | 158 auth_no_pass_cb(PurpleConnection *gc, PurpleRequestFields *fields) |
| 159 { | 159 { |
| 160 PurpleAccount *account; | |
| 160 JabberStream *js; | 161 JabberStream *js; |
| 161 | 162 |
| 162 /* The password prompt dialog doesn't get disposed if the account disconnects */ | 163 /* The password prompt dialog doesn't get disposed if the account disconnects */ |
| 163 if (!PURPLE_CONNECTION_IS_VALID(conn)) | 164 if (!PURPLE_CONNECTION_IS_VALID(gc)) |
| 164 return; | 165 return; |
| 165 | 166 |
| 166 js = conn->proto_data; | 167 account = purple_connection_get_account(gc); |
| 168 js = purple_connection_get_protocol_data(gc); | |
| 167 | 169 |
| 168 /* Disable the account as the user has canceled connecting */ | 170 /* Disable the account as the user has canceled connecting */ |
| 169 purple_account_set_enabled(conn->account, purple_core_get_ui(), FALSE); | 171 purple_account_set_enabled(account, purple_core_get_ui(), FALSE); |
| 170 } | 172 } |
| 171 | 173 |
| 172 static xmlnode *jabber_auth_start_cyrus(JabberStream *js) | 174 static xmlnode *jabber_auth_start_cyrus(JabberStream *js) |
| 173 { | 175 { |
| 174 PurpleAccount *account; | 176 PurpleAccount *account; |
