Mercurial > pidgin
comparison libgaim/protocols/silc/silc.c @ 14262:baff095b146c
[gaim-migrate @ 16944]
Rename GaimProxyConnectInfo to GaimProxyConnectData, and change the
variables from connect_info to connect_data. Sorry, but I wanted
to get this right before it becomes permanent.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 21 Aug 2006 05:25:44 +0000 |
parents | 60b1bc8dbf37 |
children | 8ed6ef220b2d |
comparison
equal
deleted
inserted
replaced
14261:bb060cdc23d1 | 14262:baff095b146c |
---|---|
152 const char *dfile; | 152 const char *dfile; |
153 | 153 |
154 g_return_if_fail(gc != NULL); | 154 g_return_if_fail(gc != NULL); |
155 | 155 |
156 sg = gc->proto_data; | 156 sg = gc->proto_data; |
157 sg->connect_info = NULL; | 157 sg->connect_data = NULL; |
158 | 158 |
159 if (source < 0) { | 159 if (source < 0) { |
160 gaim_connection_error(gc, _("Connection failed")); | 160 gaim_connection_error(gc, _("Connection failed")); |
161 return; | 161 return; |
162 } | 162 } |
355 sg->gc = gc; | 355 sg->gc = gc; |
356 sg->account = account; | 356 sg->account = account; |
357 gc->proto_data = sg; | 357 gc->proto_data = sg; |
358 | 358 |
359 /* Connect to the SILC server */ | 359 /* Connect to the SILC server */ |
360 sg->connect_info = gaim_proxy_connect(account, | 360 sg->connect_data = gaim_proxy_connect(account, |
361 gaim_account_get_string(account, "server", | 361 gaim_account_get_string(account, "server", |
362 "silc.silcnet.org"), | 362 "silc.silcnet.org"), |
363 gaim_account_get_int(account, "port", 706), | 363 gaim_account_get_int(account, "port", 706), |
364 silcgaim_login_connected, gc); | 364 silcgaim_login_connected, gc); |
365 if (sg->connect_info == NULL) | 365 if (sg->connect_data == NULL) |
366 { | 366 { |
367 gaim_connection_error(gc, _("Unable to create connection")); | 367 gaim_connection_error(gc, _("Unable to create connection")); |
368 return; | 368 return; |
369 } | 369 } |
370 | 370 |
380 silcgaim_close_final(gpointer *context) | 380 silcgaim_close_final(gpointer *context) |
381 { | 381 { |
382 SilcGaim sg = (SilcGaim)context; | 382 SilcGaim sg = (SilcGaim)context; |
383 silc_client_stop(sg->client); | 383 silc_client_stop(sg->client); |
384 silc_client_free(sg->client); | 384 silc_client_free(sg->client); |
385 if (sg->connect_info != NULL) | 385 if (sg->connect_data != NULL) |
386 gaim_proxy_connect_cancel(sg->connect_info); | 386 gaim_proxy_connect_cancel(sg->connect_data); |
387 #ifdef HAVE_SILCMIME_H | 387 #ifdef HAVE_SILCMIME_H |
388 if (sg->mimeass) | 388 if (sg->mimeass) |
389 silc_mime_assembler_free(sg->mimeass); | 389 silc_mime_assembler_free(sg->mimeass); |
390 #endif | 390 #endif |
391 silc_free(sg); | 391 silc_free(sg); |