comparison: src/protocols/msn/directconn.c
src/protocols/msn/directconn.c
- changeset 14151
- 34427f138b1f
- parent 14145
- 37a331b097b3
- child 14170
- f611621bc8a0
equal
deleted
inserted
replaced
| 14150:b9617d019b31 | 14151:34427f138b1f |
|---|---|
| 366 msn_directconn_destroy(directconn); | 366 msn_directconn_destroy(directconn); |
| 367 } | 367 } |
| 368 } | 368 } |
| 369 | 369 |
| 370 static void | 370 static void |
| 371 connect_cb(gpointer data, gint source, GaimInputCondition cond) | 371 connect_cb(gpointer data, gint source) |
| 372 { | 372 { |
| 373 MsnDirectConn* directconn; | 373 MsnDirectConn* directconn; |
| 374 int fd; | 374 int fd; |
| 375 | 375 |
| 376 gaim_debug_misc("msn", "directconn: connect_cb: %d, %d.\n", source, cond); | 376 gaim_debug_misc("msn", "directconn: connect_cb: %d\n", source); |
| 377 | 377 |
| 378 directconn = data; | 378 directconn = data; |
| 379 | 379 |
| 380 if (TRUE) | 380 if (TRUE) |
| 381 { | 381 { |
| 421 | 421 |
| 422 gboolean | 422 gboolean |
| 423 msn_directconn_connect(MsnDirectConn *directconn, const char *host, int port) | 423 msn_directconn_connect(MsnDirectConn *directconn, const char *host, int port) |
| 424 { | 424 { |
| 425 MsnSession *session; | 425 MsnSession *session; |
| 426 int r; | 426 GaimProxyConnectInfo *connect_info; |
| 427 | 427 |
| 428 g_return_val_if_fail(directconn != NULL, FALSE); | 428 g_return_val_if_fail(directconn != NULL, FALSE); |
| 429 g_return_val_if_fail(host != NULL, TRUE); | 429 g_return_val_if_fail(host != NULL, TRUE); |
| 430 g_return_val_if_fail(port > 0, FALSE); | 430 g_return_val_if_fail(port > 0, FALSE); |
| 431 | 431 |
| 436 { | 436 { |
| 437 servconn->http_data->gateway_host = g_strdup(host); | 437 servconn->http_data->gateway_host = g_strdup(host); |
| 438 } | 438 } |
| 439 #endif | 439 #endif |
| 440 | 440 |
| 441 r = gaim_proxy_connect(session->account, host, port, connect_cb, | 441 connect_info = gaim_proxy_connect(session->account, host, port, |
| 442 directconn); | 442 connect_cb, NULL, directconn); |
| 443 | 443 |
| 444 if (r == 0) | 444 if (connect_info != NULL) |
| 445 { | 445 { |
| 446 return TRUE; | 446 return TRUE; |
| 447 } | 447 } |
| 448 else | 448 else |
| 449 return FALSE; | 449 return FALSE; |
