Mercurial > pidgin
changeset 1092:a930439f29b1
[gaim-migrate @ 1102]
fun fun
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Mon, 13 Nov 2000 04:29:41 +0000 |
| parents | 3d6ab4f1fa55 |
| children | 46ffd2dca607 |
| files | src/Makefile.am src/buddy.c src/html.c src/network.c src/oscar.c src/rvous.c |
| diffstat | 6 files changed, 9 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile.am Mon Nov 13 03:57:40 2000 +0000 +++ b/src/Makefile.am Mon Nov 13 04:29:41 2000 +0000 @@ -15,7 +15,6 @@ html.c \ idle.c \ multi.c \ - network.c \ oscar.c \ perl.c \ plugins.c \ @@ -47,7 +46,6 @@ html.c \ idle.c \ multi.c \ - network.c \ oscar.c \ perl.c \ plugins.c \
--- a/src/buddy.c Mon Nov 13 03:57:40 2000 +0000 +++ b/src/buddy.c Mon Nov 13 04:29:41 2000 +0000 @@ -923,7 +923,7 @@ g->members = NULL; - if (!blist) return; + if (!blist) return g; build_edit_tree();
--- a/src/html.c Mon Nov 13 03:57:40 2000 +0000 +++ b/src/html.c Mon Nov 13 04:29:41 2000 +0000 @@ -37,6 +37,7 @@ #include <netinet/in.h> #include <fcntl.h> #include <errno.h> +#include "proxy.h" gchar * strip_html(gchar * text) { @@ -108,7 +109,6 @@ int len; int read_rv; int datalen = 0; - struct in_addr *host; char buf[256]; char data; int startsaving = 0; @@ -118,10 +118,10 @@ if (user) { if ((sock = proxy_connect(website.address, website.port, user->proto_opt[2], - user->proto_opt[3], atoi(user->proto_opt[4]))) < 0) + atoi(user->proto_opt[3]), atoi(user->proto_opt[4]))) < 0) return g_strdup(_("g003: Error opening connection.\n")); } else { - if ((sock = proxy_connect(website.address, website.port, NULL, NULL, -1)) < 0) + if ((sock = proxy_connect(website.address, website.port, NULL, 0, -1)) < 0) return g_strdup(_("g003: Error opening connection.\n")); }
--- a/src/network.c Mon Nov 13 03:57:40 2000 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -/* - * gaim - * - * Copyright (C) 1998-1999, Mark Spencer <markster@marko.net> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */
--- a/src/oscar.c Mon Nov 13 03:57:40 2000 +0000 +++ b/src/oscar.c Mon Nov 13 04:29:41 2000 +0000 @@ -722,7 +722,7 @@ dim = find_direct_im(od, d->sn); if (dim) { cancel_direct_im(w, d); /* 40 */ - return; + return TRUE; } dim = g_new0(struct direct_im, 1); dim->gc = d->gc; @@ -731,7 +731,7 @@ if ((dim->conn = aim_directim_connect(od->sess, od->conn, d->priv)) == NULL) { g_free(dim); cancel_direct_im(w, d); - return; + return TRUE; } if (!(dim->cnv = find_conversation(d->sn))) dim->cnv = new_conversation(d->sn); @@ -765,8 +765,6 @@ static int accept_getfile(gpointer w, struct ask_getfile *g) { struct gaim_connection *gc = g->gc; - struct oscar_data *od = (struct oscar_data *)gc->proto_data; - struct aim_conn_t *newconn; /* if ((newconn = aim_accepttransfer(od->sess, od->conn, g->sn, g->cookie, g->ip, od->sess->oft.listing, AIM_CAPS_GETFILE)) == NULL) { @@ -831,7 +829,6 @@ } else if (rendtype & AIM_CAPS_SENDFILE) { } else if (rendtype & AIM_CAPS_GETFILE) { char *ip, *cookie; - struct aim_conn_t *newconn; struct ask_getfile *g = g_new0(struct ask_getfile, 1); char buf[256];
--- a/src/rvous.c Mon Nov 13 03:57:40 2000 +0000 +++ b/src/rvous.c Mon Nov 13 04:29:41 2000 +0000 @@ -37,6 +37,7 @@ #include <arpa/inet.h> #include <errno.h> #include <gtk/gtk.h> +#include "proxy.h" #include "gaim.h" static void do_send_file(GtkWidget *, struct file_transfer *); @@ -236,7 +237,7 @@ /* XXX is ft->port in host order or network order? */ - ft->fd = proxy_connect(ft->ip, ft->port, NULL, NULL, -1); + ft->fd = proxy_connect(ft->ip, ft->port, NULL, 0, -1); if (ft->fd <= -1) { fclose(ft->f); @@ -515,7 +516,7 @@ /* XXX is ft->port in host order or network order? */ - ft->fd = proxy_connect(ft->ip, ft->port, NULL, NULL, -1); + ft->fd = proxy_connect(ft->ip, ft->port, NULL, 0, -1); if (ft->fd <= -1) { free_ft(ft);