comparison: src/rvous.c
src/rvous.c
- changeset 1092
- 9be1c9ea4d2c
- parent 1087
- bc9c6b635358
- child 1102
- 15192fa59715
equal
deleted
inserted
replaced
| 1091:c293a6642a83 | 1092:9be1c9ea4d2c |
|---|---|
| 35 #include <unistd.h> | 35 #include <unistd.h> |
| 36 #include <netinet/in.h> | 36 #include <netinet/in.h> |
| 37 #include <arpa/inet.h> | 37 #include <arpa/inet.h> |
| 38 #include <errno.h> | 38 #include <errno.h> |
| 39 #include <gtk/gtk.h> | 39 #include <gtk/gtk.h> |
| 40 #include "proxy.h" | |
| 40 #include "gaim.h" | 41 #include "gaim.h" |
| 41 | 42 |
| 42 static void do_send_file(GtkWidget *, struct file_transfer *); | 43 static void do_send_file(GtkWidget *, struct file_transfer *); |
| 43 static void do_get_file (GtkWidget *, struct file_transfer *); | 44 static void do_get_file (GtkWidget *, struct file_transfer *); |
| 44 | 45 |
| 234 ft->window = NULL; | 235 ft->window = NULL; |
| 235 serv_rvous_accept(ft->gc, ft->user, ft->cookie, ft->UID); | 236 serv_rvous_accept(ft->gc, ft->user, ft->cookie, ft->UID); |
| 236 | 237 |
| 237 | 238 |
| 238 /* XXX is ft->port in host order or network order? */ | 239 /* XXX is ft->port in host order or network order? */ |
| 239 ft->fd = proxy_connect(ft->ip, ft->port, NULL, NULL, -1); | 240 ft->fd = proxy_connect(ft->ip, ft->port, NULL, 0, -1); |
| 240 | 241 |
| 241 if (ft->fd <= -1) { | 242 if (ft->fd <= -1) { |
| 242 fclose(ft->f); | 243 fclose(ft->f); |
| 243 free_ft(ft); | 244 free_ft(ft); |
| 244 return; | 245 return; |
| 513 ft->window = NULL; | 514 ft->window = NULL; |
| 514 serv_rvous_accept(ft->gc, ft->user, ft->cookie, ft->UID); | 515 serv_rvous_accept(ft->gc, ft->user, ft->cookie, ft->UID); |
| 515 | 516 |
| 516 | 517 |
| 517 /* XXX is ft->port in host order or network order? */ | 518 /* XXX is ft->port in host order or network order? */ |
| 518 ft->fd = proxy_connect(ft->ip, ft->port, NULL, NULL, -1); | 519 ft->fd = proxy_connect(ft->ip, ft->port, NULL, 0, -1); |
| 519 | 520 |
| 520 if (ft->fd <= -1) { | 521 if (ft->fd <= -1) { |
| 521 free_ft(ft); | 522 free_ft(ft); |
| 522 return; | 523 return; |
| 523 } | 524 } |
