comparison: libgaim/protocols/sametime/sametime.c
libgaim/protocols/sametime/sametime.c
- changeset 14324
- 8cbedd82b6ac
- parent 14254
- 77edc7a6191a
- child 14549
- f4006f140fc5
equal
deleted
inserted
replaced
| 14323:0611d91321eb | 14324:8cbedd82b6ac |
|---|---|
| 224 guint save_event; | 224 guint save_event; |
| 225 | 225 |
| 226 /** socket fd */ | 226 /** socket fd */ |
| 227 int socket; | 227 int socket; |
| 228 gint outpa; /* like inpa, but the other way */ | 228 gint outpa; /* like inpa, but the other way */ |
| 229 GaimProxyConnectInfo *connect_info; | 229 GaimProxyConnectData *connect_data; |
| 230 | 230 |
| 231 /** circular buffer for outgoing data */ | 231 /** circular buffer for outgoing data */ |
| 232 GaimCircBuffer *sock_buf; | 232 GaimCircBuffer *sock_buf; |
| 233 | 233 |
| 234 GaimConnection *gc; | 234 GaimConnection *gc; |
| 1673 static void connect_cb(gpointer data, gint source, const gchar *error_message) { | 1673 static void connect_cb(gpointer data, gint source, const gchar *error_message) { |
| 1674 | 1674 |
| 1675 struct mwGaimPluginData *pd = data; | 1675 struct mwGaimPluginData *pd = data; |
| 1676 GaimConnection *gc = pd->gc; | 1676 GaimConnection *gc = pd->gc; |
| 1677 | 1677 |
| 1678 pd->connect_info = NULL; | 1678 pd->connect_data = NULL; |
| 1679 | 1679 |
| 1680 if(source < 0) { | 1680 if(source < 0) { |
| 1681 /* connection failed */ | 1681 /* connection failed */ |
| 1682 | 1682 |
| 1683 if(pd->socket) { | 1683 if(pd->socket) { |
| 3679 mwSession_setProperty(pd->session, mwSession_CLIENT_TYPE_ID, | 3679 mwSession_setProperty(pd->session, mwSession_CLIENT_TYPE_ID, |
| 3680 GUINT_TO_POINTER(client), NULL); | 3680 GUINT_TO_POINTER(client), NULL); |
| 3681 | 3681 |
| 3682 gaim_connection_update_progress(gc, _("Connecting"), 1, MW_CONNECT_STEPS); | 3682 gaim_connection_update_progress(gc, _("Connecting"), 1, MW_CONNECT_STEPS); |
| 3683 | 3683 |
| 3684 pd->connect_info = gaim_proxy_connect(account, host, port, connect_cb, pd); | 3684 pd->connect_data = gaim_proxy_connect(account, host, port, connect_cb, pd); |
| 3685 if(pd->connect_info == NULL) { | 3685 if(pd->connect_data == NULL) { |
| 3686 gaim_connection_error(gc, _("Unable to connect to host")); | 3686 gaim_connection_error(gc, _("Unable to connect to host")); |
| 3687 } | 3687 } |
| 3688 } | 3688 } |
| 3689 | 3689 |
| 3690 | 3690 |
| 3713 if(gc->inpa) { | 3713 if(gc->inpa) { |
| 3714 gaim_input_remove(gc->inpa); | 3714 gaim_input_remove(gc->inpa); |
| 3715 gc->inpa = 0; | 3715 gc->inpa = 0; |
| 3716 } | 3716 } |
| 3717 | 3717 |
| 3718 if(pd->connect_info != NULL) { | 3718 if(pd->connect_data != NULL) { |
| 3719 gaim_proxy_connect_cancel(pd->connect_info); | 3719 gaim_proxy_connect_cancel(pd->connect_data); |
| 3720 pd->connect_info = NULL; | 3720 pd->connect_data = NULL; |
| 3721 } | 3721 } |
| 3722 | 3722 |
| 3723 /* clean up the rest */ | 3723 /* clean up the rest */ |
| 3724 mwGaimPluginData_free(pd); | 3724 mwGaimPluginData_free(pd); |
| 3725 } | 3725 } |
