Pidgin

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv29852

Modified Files:
	aim.h ft.c info.c 
Log Message:
sync

Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- aim.h	2001/12/10 06:13:18	1.26
+++ aim.h	2001/12/22 04:02:28	1.27
@@ -857,6 +857,7 @@
 
 #define AIM_GETINFO_GENERALINFO 0x00001
 #define AIM_GETINFO_AWAYMESSAGE 0x00003
+#define AIM_GETINFO_CAPABILITIES 0x0004
 
 struct aim_invite_priv {
 	char *sn;

Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ft.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ft.c	2001/12/04 08:04:21	1.10
+++ ft.c	2001/12/22 04:02:29	1.11
@@ -4,6 +4,7 @@
  */
 
 #define FAIM_INTERNAL
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

Index: info.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/info.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- info.c	2001/12/10 00:48:27	1.9
+++ info.c	2001/12/22 04:02:29	1.10
@@ -23,9 +23,6 @@
 	if (!sess || !conn || !sn)
 		return -EINVAL;
 
-	if ((infotype != AIM_GETINFO_GENERALINFO) && (infotype != AIM_GETINFO_AWAYMESSAGE))
-		return -EINVAL;
-
 	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 12+1+strlen(sn))))
 		return -ENOMEM;
 
@@ -601,7 +598,8 @@
 	inforeq = (struct aim_priv_inforeq *)origsnac->data;
 
 	if ((inforeq->infotype != AIM_GETINFO_GENERALINFO) &&
-			(inforeq->infotype != AIM_GETINFO_AWAYMESSAGE)) {
+			(inforeq->infotype != AIM_GETINFO_AWAYMESSAGE) &&
+			(inforeq->infotype != AIM_GETINFO_CAPABILITIES)) {
 		faimdprintf(sess, 0, "parse_userinfo_middle: unknown infotype in request! (0x%04x)\n", inforeq->infotype);
 		return 0;
 	}
@@ -614,18 +612,30 @@
 	 * Depending on what informational text was requested, different
 	 * TLVs will appear here.
 	 *
-	 * Profile will be 1 and 2, away message will be 3 and 4.
+	 * Profile will be 1 and 2, away message will be 3 and 4, caps
+	 * will be 5.
 	 */
-	if (aim_gettlv(tlvlist, 0x0001, 1)) {
+	if (inforeq->infotype == AIM_GETINFO_GENERALINFO) {
 		text_encoding = aim_gettlv_str(tlvlist, 0x0001, 1);
 		text = aim_gettlv_str(tlvlist, 0x0002, 1);
-	} else if (aim_gettlv(tlvlist, 0x0003, 1)) {
+	} else if (inforeq->infotype == AIM_GETINFO_AWAYMESSAGE) {
 		text_encoding = aim_gettlv_str(tlvlist, 0x0003, 1);
 		text = aim_gettlv_str(tlvlist, 0x0004, 1);
+	} else if (inforeq->infotype == AIM_GETINFO_CAPABILITIES) {
+		aim_tlv_t *ct;
+
+		if ((ct = aim_gettlv(tlvlist, 0x0005, 1))) {
+			aim_bstream_t cbs;
+
+			aim_bstream_init(&cbs, ct->value, ct->length);
+
+			userinfo.capabilities = aim_getcap(sess, &cbs, ct->length);
+			userinfo.capspresent = 1;
+		}
 	}
 
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-		ret = userfunc(sess, rx, &userinfo, text_encoding, text, inforeq->infotype);
+		ret = userfunc(sess, rx, &userinfo, inforeq->infotype, text_encoding, text);
 
 	free(text_encoding);
 	free(text);

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv24474

Modified Files:
	conversation.c multi.h 
Log Message:
whoops


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -d -r1.322 -r1.323
--- conversation.c	2001/12/22 00:35:53	1.322
+++ conversation.c	2001/12/22 03:38:19	1.323
@@ -1592,7 +1592,7 @@
 		g_snprintf(buf, BUF_LONG, "<B><FONT COLOR=\"#777777\">%s</FONT></B><BR>", what);
 		gtk_imhtml_append_text(GTK_IMHTML(c->text), buf, -1, 0);
 	} else {
-		if (c->gc->flags & OPT_CONN_HTML)
+		if (c->gc->flags & OPT_CONN_SHOW_HTML)
 			what = g_memdup(what, length == -1 ? strlen(what) + 1 : length);
 		else
 			what = escape_html(what, &length);

Index: multi.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- multi.h	2001/11/10 08:02:39	1.37
+++ multi.h	2001/12/22 03:38:19	1.38
@@ -74,6 +74,7 @@
 };
 
 #define OPT_CONN_HTML		0x00000001
+#define OPT_CONN_SHOW_HTML	0x00000002
 
 struct proto_user_opt {
 	char *label;

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory usw-pr-cvs1:/tmp/cvs-serv24474/protocols/irc

Modified Files:
	irc.c 
Log Message:
whoops


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- irc.c	2001/12/21 23:46:41	1.67
+++ irc.c	2001/12/22 03:38:20	1.68
@@ -1073,8 +1073,8 @@
 	struct irc_data *idata = gc->proto_data = g_new0(struct irc_data, 1);
 
 	g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", gc->username);
-	gc->flags = OPT_CONN_HTML; /* this is bad. the reason for this is gtkimhtml doesn't
-				      understand the xchat escapes. so we translate. */
+	gc->flags = OPT_CONN_SHOW_HTML; /* this is bad. the reason for this is gtkimhtml doesn't
+					   understand the xchat escapes. so we translate. */
 
 	g_snprintf(buf, sizeof(buf), "Signon: %s", gc->username);
 	set_login_progress(gc, 2, buf);

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv24474/protocols/yahoo

Modified Files:
	yahoo.c 
Log Message:
whoops


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- yahoo.c	2001/12/21 23:46:41	1.28
+++ yahoo.c	2001/12/22 03:38:20	1.29
@@ -707,7 +707,7 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 
-	gc->flags = OPT_CONN_HTML; /* it does to an extent.... */
+	gc->flags = OPT_CONN_HTML | OPT_CONN_SHOW_HTML; /* it does to an extent.... */
 
 	set_login_progress(gc, 1, "Connecting");

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv24474/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
whoops


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- oscar.c	2001/12/21 22:47:59	1.87
+++ oscar.c	2001/12/22 03:38:20	1.88
@@ -460,7 +460,7 @@
 		gc->password[9] = 0;
 	} else {
 		gc->protocol = PROTO_TOC;
-		gc->flags |= OPT_CONN_HTML;
+		gc->flags |= OPT_CONN_HTML | OPT_CONN_SHOW_HTML;
 	}
 
 	sess = g_new0(aim_session_t, 1);

Update of /cvsroot/gaim/gaim/src/protocols/toc
In directory usw-pr-cvs1:/tmp/cvs-serv24474/protocols/toc

Modified Files:
	toc.c 
Log Message:
whoops


Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- toc.c	2001/12/08 09:48:52	1.38
+++ toc.c	2001/12/22 03:38:20	1.39
@@ -143,7 +143,7 @@
 
 	gc = new_gaim_conn(user);
 	gc->proto_data = tdt = g_new0(struct toc_data, 1);
-	gc->flags |= OPT_CONN_HTML;
+	gc->flags |= OPT_CONN_HTML | OPT_CONN_SHOW_HTML;
 
 	g_snprintf(buf, sizeof buf, "Looking up %s",
 		   user->proto_opt[USEROPT_AUTH][0] ? user->proto_opt[USEROPT_AUTH] : TOC_HOST);

Update of /cvsroot/gaim/gaim/src/protocols/gg
In directory usw-pr-cvs1:/tmp/cvs-serv17848/protocols/gg

Modified Files:
	gg.c 
Log Message:
leave it alone


Index: gg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/gg.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gg.c	2001/12/08 09:48:52	1.16
+++ gg.c	2001/12/22 00:41:30	1.17
@@ -334,6 +334,7 @@
 		gd->sess->fd = source;
 
 	if (source == -1) {
+		hide_login_progress(gc, _("Could not connect"));
 		signoff(gc);
 		return;
 	}

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv16797

Modified Files:
	conversation.c 
Log Message:
whoops


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.321
retrieving revision 1.322
diff -u -d -r1.321 -r1.322
--- conversation.c	2001/12/21 23:46:41	1.321
+++ conversation.c	2001/12/22 00:35:53	1.322
@@ -1593,7 +1593,7 @@
 		gtk_imhtml_append_text(GTK_IMHTML(c->text), buf, -1, 0);
 	} else {
 		if (c->gc->flags & OPT_CONN_HTML)
-			what = g_memdup(what, length);
+			what = g_memdup(what, length == -1 ? strlen(what) + 1 : length);
 		else
 			what = escape_html(what, &length);
 		if (flags & WFLAG_WHISPER) {

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv3589

Modified Files:
	conversation.c 
Log Message:
eh


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -r1.320 -r1.321
--- conversation.c	2001/12/20 09:26:12	1.320
+++ conversation.c	2001/12/21 23:46:41	1.321
@@ -1151,6 +1151,43 @@
 	g_free(s);
 }
 
+static char *escape_html(char *w, int *l)
+{
+	int c = 0;
+	char *r;
+	int i, x = 0;
+	if (*l == -1) {
+		*l = strlen(w);
+		x = 1;
+	}
+	r = g_malloc(*l * 5 + 1);
+
+	for (i = 0; i < *l; i++) {
+		if (w[i] == '<') {
+			r[c++] = '&';
+			r[c++] = 'l';
+			r[c++] = 't';
+			r[c++] = ';';
+		} else if (w[i] == '&') {
+			r[c++] = '&';
+			r[c++] = 'a';
+			r[c++] = 'm';
+			r[c++] = 'p';
+			r[c++] = ';';
+		} else {
+			r[c++] = w[i];
+		}
+	}
+	r[c] = 0;
+
+	r = g_realloc(r, c + 1);
+	if (x)
+		*l = -1;
+	else
+		*l = c;
+	return r;
+}
+
 static char *html_logize(char *p)
 {
 
@@ -1555,6 +1592,10 @@
 		g_snprintf(buf, BUF_LONG, "<B><FONT COLOR=\"#777777\">%s</FONT></B><BR>", what);
 		gtk_imhtml_append_text(GTK_IMHTML(c->text), buf, -1, 0);
 	} else {
+		if (c->gc->flags & OPT_CONN_HTML)
+			what = g_memdup(what, length);
+		else
+			what = escape_html(what, &length);
 		if (flags & WFLAG_WHISPER) {
 			/* if we're whispering, it's not an autoresponse */
 			if (meify(what, length)) {
@@ -1661,6 +1702,8 @@
 			g_free(t2);
 			g_free(nm);
 		}
+
+		g_free(what);
 	}
 
 	if ((c->is_chat && (chat_options & OPT_CHAT_POPUP)) ||

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv3589/protocols/yahoo

Modified Files:
	yahoo.c 
Log Message:
eh


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- yahoo.c	2001/12/12 23:45:17	1.27
+++ yahoo.c	2001/12/21 23:46:41	1.28
@@ -707,6 +707,8 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 
+	gc->flags = OPT_CONN_HTML; /* it does to an extent.... */
+
 	set_login_progress(gc, 1, "Connecting");
 
 	yd->fd = -1;

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory usw-pr-cvs1:/tmp/cvs-serv3589/protocols/irc

Modified Files:
	irc.c 
Log Message:
eh


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- irc.c	2001/12/08 09:48:52	1.66
+++ irc.c	2001/12/21 23:46:41	1.67
@@ -1073,6 +1073,8 @@
 	struct irc_data *idata = gc->proto_data = g_new0(struct irc_data, 1);
 
 	g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", gc->username);
+	gc->flags = OPT_CONN_HTML; /* this is bad. the reason for this is gtkimhtml doesn't
+				      understand the xchat escapes. so we translate. */
 
 	g_snprintf(buf, sizeof(buf), "Signon: %s", gc->username);
 	set_login_progress(gc, 2, buf);

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv30532

Modified Files:
	proxy.c 
Log Message:
wait


Index: proxy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- proxy.c	2001/12/21 22:42:41	1.38
+++ proxy.c	2001/12/21 23:27:48	1.39
@@ -33,6 +33,7 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -118,6 +119,25 @@
 		g_source_remove(tag);
 }
 
+static struct sockaddr_in *gaim_gethostbyname(char *host, int port)
+{
+	static struct sockaddr_in sin;
+
+	if (!inet_aton(host, &sin.sin_addr)) {
+		struct hostent *hp;
+		if (!(hp = gethostbyname(host))) {
+			return NULL;
+		}
+		memset(&sin, 0, sizeof(struct sockaddr_in));
+		memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
+		sin.sin_family = hp->h_addrtype;
+	} else
+		sin.sin_family = AF_INET;
+	sin.sin_port = htons(port);
+
+	return &sin;
+}
+
 static void no_one_calls(gpointer data, gint source, GaimInputCondition cond)
 {
 	struct PHB *phb = data;
@@ -151,31 +171,25 @@
 
 static int proxy_connect_none(char *host, unsigned short port, struct PHB *phb)
 {
-	struct sockaddr_in sin;
-	struct hostent *hp;
+	struct sockaddr_in *sin;
 	int fd = -1;
 
 	debug_printf("connecting to %s:%d with no proxy\n", host, port);
 
-	if (!(hp = gethostbyname(host))) {
+	if (!(sin = gaim_gethostbyname(host, port))) {
 		debug_printf("gethostbyname failed\n");
 		g_free(phb);
 		return -1;
 	}
 
-	memset(&sin, 0, sizeof(struct sockaddr_in));
-	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
-	sin.sin_family = hp->h_addrtype;
-	sin.sin_port = htons(port);
-
-	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
+	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
 		debug_printf("unable to create socket\n");
 		g_free(phb);
 		return -1;
 	}
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, no_one_calls, phb);
@@ -302,23 +316,17 @@
 
 static int proxy_connect_http(char *host, unsigned short port, struct PHB *phb)
 {
-	struct hostent *hp;
-	struct sockaddr_in sin;
+	struct sockaddr_in *sin;
 	int fd = -1;
 
 	debug_printf("connecting to %s:%d via %s:%d using HTTP\n", host, port, proxyhost, proxyport);
 
-	if (!(hp = gethostbyname(proxyhost))) {
+	if (!(sin = gaim_gethostbyname(proxyhost, port))) {
 		g_free(phb);
 		return -1;
 	}
-
-	memset(&sin, 0, sizeof(struct sockaddr_in));
-	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
-	sin.sin_family = hp->h_addrtype;
-	sin.sin_port = htons(proxyport);
 
-	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
+	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
 		g_free(phb);
 		return -1;
 	}
@@ -327,7 +335,7 @@
 	phb->port = port;
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, http_canwrite, phb);
@@ -427,23 +435,17 @@
 
 static int proxy_connect_socks4(char *host, unsigned short port, struct PHB *phb)
 {
-	struct sockaddr_in sin;
-	struct hostent *hp;
+	struct sockaddr_in *sin;
 	int fd = -1;
 
 	debug_printf("connecting to %s:%d via %s:%d using SOCKS4\n", host, port, proxyhost, proxyport);
 
-	if (!(hp = gethostbyname(proxyhost))) {
+	if (!(sin = gaim_gethostbyname(proxyhost, port))) {
 		g_free(phb);
 		return -1;
 	}
-
-	memset(&sin, 0, sizeof(struct sockaddr_in));
-	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
-	sin.sin_family = hp->h_addrtype;
-	sin.sin_port = htons(proxyport);
 
-	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
+	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
 		g_free(phb);
 		return -1;
 	}
@@ -452,7 +454,7 @@
 	phb->port = port;
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, s4_canwrite, phb);
@@ -656,23 +658,17 @@
 
 static int proxy_connect_socks5(char *host, unsigned short port, struct PHB *phb)
 {
+	struct sockaddr_in *sin;
 	int fd = -1;
-	struct sockaddr_in sin;
-	struct hostent *hp;
 
 	debug_printf("connecting to %s:%d via %s:%d using SOCKS5\n", host, port, proxyhost, proxyport);
 
-	if (!(hp = gethostbyname(proxyhost))) {
+	if (!(sin = gaim_gethostbyname(proxyhost, port))) {
 		g_free(phb);
 		return -1;
 	}
 
-	memset(&sin, 0, sizeof(struct sockaddr_in));
-	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
-	sin.sin_family = hp->h_addrtype;
-	sin.sin_port = htons(proxyport);
-
-	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
+	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
 		g_free(phb);
 		return -1;
 	}
@@ -681,7 +677,7 @@
 	phb->port = port;
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, s5_canwrite, phb);

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv21889

Modified Files:
	README 
Log Message:
hi.


Index: README
===================================================================
RCS file: /cvsroot/gaim/gaim/README,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- README	2001/12/09 13:18:58	1.24
+++ README	2001/12/21 22:50:52	1.25
@@ -127,7 +127,8 @@
 
 For ICQ, it supports nearly everything that the old ICQ plugin supported,
 which isn't much. To use Oscar for ICQ, enter your ICQ UIN as the
-screenname. The default host/port will work.
+screenname. The default host/port will work. You'll need to use a different
+client to register a new ICQ account if you don't have one yet.
 
 
 Yahoo (Eric)
@@ -161,7 +162,9 @@
 ===
 
 The ICQ plugin is deprecated and will probably be removed soon. The
-protocol only marginally works. You should use Oscar for ICQ.
+protocol only marginally works. You should use Oscar for ICQ. You'll
+need a different client to register an ICQ account if you don't have
+one yet.
 
 
 Jabber (Eric)
@@ -172,7 +175,8 @@
 transports though). In order to use a server other than jabber.org, set
 your username to include the server, e.g. warmenhoven@.... This
 is the actual format of the Jabber ID anyway; Jabber is email with online
-notification.
+notification. You'll need to use a different client to register a Jabber
+account if you don't have one yet.
 
 
 Napster (Rob)
@@ -203,4 +207,6 @@
 I really shouldn't be taking credit for Gadu-Gadu, I'm just the person who
 commits the patches that Arkadiusz Miskiewicz gives me. Gadu-Gadu is an IM
 system most similar to ICQ that is quite popular in Poland. It can manage
-your server-side buddy list through the Protocol Actions menu.
+your server-side buddy list through the Protocol Actions menu. You'll need
+to use a different client to register a new account if you don't have one
+yet.

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv20951

Modified Files:
	gaimrc.c 
Log Message:
he got it right, i got it wrong.


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- gaimrc.c	2001/12/21 10:23:04	1.91
+++ gaimrc.c	2001/12/21 22:46:13	1.92
@@ -827,7 +827,7 @@
 	fprintf(f, "\tchat_options { %u }\n", chat_options);
 	fprintf(f, "\tfont_options { %u }\n", font_options);
 	fprintf(f, "\tsound_options { %u }\n", sound_options);
-	fprintf(f, "\taway_options { %u }\n", away_options);
+	fprintf(f, "\taway_options { %u } { %u }\n", away_options, away_resend);
 
 	fprintf(f, "\tfont_xfld { %s }\n", fontxfld);
 	fprintf(f, "\tfont_face { %s }\n", fontface);

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv20287

Modified Files:
	proxy.c 
Log Message:
evidently this broke things.


Index: proxy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- proxy.c	2001/12/21 10:23:04	1.37
+++ proxy.c	2001/12/21 22:42:41	1.38
@@ -33,7 +33,6 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -119,24 +118,6 @@
 		g_source_remove(tag);
 }
 
-static struct sockaddr_in *gaim_gethostbyname(char *host)
-{
-	static struct sockaddr_in sin;
-
-	if (!inet_aton(host, &sin.sin_addr)) {
-		struct hostent *hp;
-		if (!(hp = gethostbyname(host))) {
-			return NULL;
-		}
-		memset(&sin, 0, sizeof(struct sockaddr_in));
-		memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
-		sin.sin_family = hp->h_addrtype;
-	} else
-		sin.sin_family = AF_INET;
-
-	return &sin;
-}
-
 static void no_one_calls(gpointer data, gint source, GaimInputCondition cond)
 {
 	struct PHB *phb = data;
@@ -170,25 +151,31 @@
 
 static int proxy_connect_none(char *host, unsigned short port, struct PHB *phb)
 {
-	struct sockaddr_in *sin;
+	struct sockaddr_in sin;
+	struct hostent *hp;
 	int fd = -1;
 
 	debug_printf("connecting to %s:%d with no proxy\n", host, port);
 
-	if (!(sin = gaim_gethostbyname(host))) {
+	if (!(hp = gethostbyname(host))) {
 		debug_printf("gethostbyname failed\n");
 		g_free(phb);
 		return -1;
 	}
 
-	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
+	memset(&sin, 0, sizeof(struct sockaddr_in));
+	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
+	sin.sin_family = hp->h_addrtype;
+	sin.sin_port = htons(port);
+
+	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
 		debug_printf("unable to create socket\n");
 		g_free(phb);
 		return -1;
 	}
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, no_one_calls, phb);
@@ -315,17 +302,23 @@
 
 static int proxy_connect_http(char *host, unsigned short port, struct PHB *phb)
 {
-	struct sockaddr_in *sin;
+	struct hostent *hp;
+	struct sockaddr_in sin;
 	int fd = -1;
 
 	debug_printf("connecting to %s:%d via %s:%d using HTTP\n", host, port, proxyhost, proxyport);
 
-	if (!(sin = gaim_gethostbyname(proxyhost))) {
+	if (!(hp = gethostbyname(proxyhost))) {
 		g_free(phb);
 		return -1;
 	}
 
-	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
+	memset(&sin, 0, sizeof(struct sockaddr_in));
+	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
+	sin.sin_family = hp->h_addrtype;
+	sin.sin_port = htons(proxyport);
+
+	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
 		g_free(phb);
 		return -1;
 	}
@@ -334,7 +327,7 @@
 	phb->port = port;
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, http_canwrite, phb);
@@ -434,17 +427,23 @@
 
 static int proxy_connect_socks4(char *host, unsigned short port, struct PHB *phb)
 {
-	struct sockaddr_in *sin;
+	struct sockaddr_in sin;
+	struct hostent *hp;
 	int fd = -1;
 
 	debug_printf("connecting to %s:%d via %s:%d using SOCKS4\n", host, port, proxyhost, proxyport);
 
-	if (!(sin = gaim_gethostbyname(proxyhost))) {
+	if (!(hp = gethostbyname(proxyhost))) {
 		g_free(phb);
 		return -1;
 	}
 
-	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
+	memset(&sin, 0, sizeof(struct sockaddr_in));
+	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
+	sin.sin_family = hp->h_addrtype;
+	sin.sin_port = htons(proxyport);
+
+	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
 		g_free(phb);
 		return -1;
 	}
@@ -453,7 +452,7 @@
 	phb->port = port;
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, s4_canwrite, phb);
@@ -657,17 +656,23 @@
 
 static int proxy_connect_socks5(char *host, unsigned short port, struct PHB *phb)
 {
-	struct sockaddr_in *sin;
 	int fd = -1;
+	struct sockaddr_in sin;
+	struct hostent *hp;
 
 	debug_printf("connecting to %s:%d via %s:%d using SOCKS5\n", host, port, proxyhost, proxyport);
 
-	if (!(sin = gaim_gethostbyname(proxyhost))) {
+	if (!(hp = gethostbyname(proxyhost))) {
 		g_free(phb);
 		return -1;
 	}
 
-	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
+	memset(&sin, 0, sizeof(struct sockaddr_in));
+	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
+	sin.sin_family = hp->h_addrtype;
+	sin.sin_port = htons(proxyport);
+
+	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
 		g_free(phb);
 		return -1;
 	}
@@ -676,7 +681,7 @@
 	phb->port = port;
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, s5_canwrite, phb);

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv11879

Modified Files:
	aim.h ft.c info.c 
Log Message:
jeez, i'm just undoing everything i did today, aren't i


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- aim.h	2001/12/22 04:02:28	1.27
+++ aim.h	2001/12/22 08:11:11	1.28
@@ -857,7 +857,6 @@
 
 #define AIM_GETINFO_GENERALINFO 0x00001
 #define AIM_GETINFO_AWAYMESSAGE 0x00003
-#define AIM_GETINFO_CAPABILITIES 0x0004
 
 struct aim_invite_priv {
 	char *sn;

Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ft.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ft.c	2001/12/22 04:02:29	1.11
+++ ft.c	2001/12/22 08:11:11	1.12
@@ -4,7 +4,6 @@
  */
 
 #define FAIM_INTERNAL
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

Index: info.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/info.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- info.c	2001/12/22 04:02:29	1.10
+++ info.c	2001/12/22 08:11:11	1.11
@@ -23,6 +23,9 @@
 	if (!sess || !conn || !sn)
 		return -EINVAL;
 
+	if ((infotype != AIM_GETINFO_GENERALINFO) && (infotype != AIM_GETINFO_AWAYMESSAGE))
+		return -EINVAL;
+
 	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 12+1+strlen(sn))))
 		return -ENOMEM;
 
@@ -598,8 +601,7 @@
 	inforeq = (struct aim_priv_inforeq *)origsnac->data;
 
 	if ((inforeq->infotype != AIM_GETINFO_GENERALINFO) &&
-			(inforeq->infotype != AIM_GETINFO_AWAYMESSAGE) &&
-			(inforeq->infotype != AIM_GETINFO_CAPABILITIES)) {
+			(inforeq->infotype != AIM_GETINFO_AWAYMESSAGE)) {
 		faimdprintf(sess, 0, "parse_userinfo_middle: unknown infotype in request! (0x%04x)\n", inforeq->infotype);
 		return 0;
 	}
@@ -612,30 +614,18 @@
 	 * Depending on what informational text was requested, different
 	 * TLVs will appear here.
 	 *
-	 * Profile will be 1 and 2, away message will be 3 and 4, caps
-	 * will be 5.
+	 * Profile will be 1 and 2, away message will be 3 and 4.
 	 */
-	if (inforeq->infotype == AIM_GETINFO_GENERALINFO) {
+	if (aim_gettlv(tlvlist, 0x0001, 1)) {
 		text_encoding = aim_gettlv_str(tlvlist, 0x0001, 1);
 		text = aim_gettlv_str(tlvlist, 0x0002, 1);
-	} else if (inforeq->infotype == AIM_GETINFO_AWAYMESSAGE) {
+	} else if (aim_gettlv(tlvlist, 0x0003, 1)) {
 		text_encoding = aim_gettlv_str(tlvlist, 0x0003, 1);
 		text = aim_gettlv_str(tlvlist, 0x0004, 1);
-	} else if (inforeq->infotype == AIM_GETINFO_CAPABILITIES) {
-		aim_tlv_t *ct;
-
-		if ((ct = aim_gettlv(tlvlist, 0x0005, 1))) {
-			aim_bstream_t cbs;
-
-			aim_bstream_init(&cbs, ct->value, ct->length);
-
-			userinfo.capabilities = aim_getcap(sess, &cbs, ct->length);
-			userinfo.capspresent = 1;
-		}
 	}
 
 	if ((userfunc = aim_callhandler(sess, rx->conn, snac->family, snac->subtype)))
-		ret = userfunc(sess, rx, &userinfo, inforeq->infotype, text_encoding, text);
+		ret = userfunc(sess, rx, &userinfo, text_encoding, text, inforeq->infotype);
 
 	free(text_encoding);
 	free(text);

Update of /cvsroot/gaim/gaim/src/protocols/toc
In directory usw-pr-cvs1:/tmp/cvs-serv11435/protocols/toc

Modified Files:
	toc.c 
Log Message:
this was a bad hack.


Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- toc.c	2001/12/22 03:38:20	1.39
+++ toc.c	2001/12/22 08:08:37	1.40
@@ -143,7 +143,7 @@
 
 	gc = new_gaim_conn(user);
 	gc->proto_data = tdt = g_new0(struct toc_data, 1);
-	gc->flags |= OPT_CONN_HTML | OPT_CONN_SHOW_HTML;
+	gc->flags |= OPT_CONN_HTML;
 
 	g_snprintf(buf, sizeof buf, "Looking up %s",
 		   user->proto_opt[USEROPT_AUTH][0] ? user->proto_opt[USEROPT_AUTH] : TOC_HOST);

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv11435/protocols/yahoo

Modified Files:
	yahoo.c 
Log Message:
this was a bad hack.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- yahoo.c	2001/12/22 03:38:20	1.29
+++ yahoo.c	2001/12/22 08:08:37	1.30
@@ -707,8 +707,6 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 
-	gc->flags = OPT_CONN_HTML | OPT_CONN_SHOW_HTML; /* it does to an extent.... */
-
 	set_login_progress(gc, 1, "Connecting");
 
 	yd->fd = -1;

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory usw-pr-cvs1:/tmp/cvs-serv11435/protocols/irc

Modified Files:
	irc.c 
Log Message:
this was a bad hack.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- irc.c	2001/12/22 03:38:20	1.68
+++ irc.c	2001/12/22 08:08:36	1.69
@@ -1073,8 +1073,6 @@
 	struct irc_data *idata = gc->proto_data = g_new0(struct irc_data, 1);
 
 	g_snprintf(gc->displayname, sizeof(gc->displayname), "%s", gc->username);
-	gc->flags = OPT_CONN_SHOW_HTML; /* this is bad. the reason for this is gtkimhtml doesn't
-					   understand the xchat escapes. so we translate. */
 
 	g_snprintf(buf, sizeof(buf), "Signon: %s", gc->username);
 	set_login_progress(gc, 2, buf);

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv11435/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
this was a bad hack.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- oscar.c	2001/12/22 03:38:20	1.88
+++ oscar.c	2001/12/22 08:08:36	1.89
@@ -460,7 +460,7 @@
 		gc->password[9] = 0;
 	} else {
 		gc->protocol = PROTO_TOC;
-		gc->flags |= OPT_CONN_HTML | OPT_CONN_SHOW_HTML;
+		gc->flags |= OPT_CONN_HTML;
 	}
 
 	sess = g_new0(aim_session_t, 1);

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv11435

Modified Files:
	conversation.c multi.h 
Log Message:
this was a bad hack.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -d -r1.323 -r1.324
--- conversation.c	2001/12/22 03:38:19	1.323
+++ conversation.c	2001/12/22 08:08:36	1.324
@@ -1151,43 +1151,6 @@
 	g_free(s);
 }
 
-static char *escape_html(char *w, int *l)
-{
-	int c = 0;
-	char *r;
-	int i, x = 0;
-	if (*l == -1) {
-		*l = strlen(w);
-		x = 1;
-	}
-	r = g_malloc(*l * 5 + 1);
-
-	for (i = 0; i < *l; i++) {
-		if (w[i] == '<') {
-			r[c++] = '&';
-			r[c++] = 'l';
-			r[c++] = 't';
-			r[c++] = ';';
-		} else if (w[i] == '&') {
-			r[c++] = '&';
-			r[c++] = 'a';
-			r[c++] = 'm';
-			r[c++] = 'p';
-			r[c++] = ';';
-		} else {
-			r[c++] = w[i];
-		}
-	}
-	r[c] = 0;
-
-	r = g_realloc(r, c + 1);
-	if (x)
-		*l = -1;
-	else
-		*l = c;
-	return r;
-}
-
 static char *html_logize(char *p)
 {
 
@@ -1592,10 +1555,6 @@
 		g_snprintf(buf, BUF_LONG, "<B><FONT COLOR=\"#777777\">%s</FONT></B><BR>", what);
 		gtk_imhtml_append_text(GTK_IMHTML(c->text), buf, -1, 0);
 	} else {
-		if (c->gc->flags & OPT_CONN_SHOW_HTML)
-			what = g_memdup(what, length == -1 ? strlen(what) + 1 : length);
-		else
-			what = escape_html(what, &length);
 		if (flags & WFLAG_WHISPER) {
 			/* if we're whispering, it's not an autoresponse */
 			if (meify(what, length)) {
@@ -1702,8 +1661,6 @@
 			g_free(t2);
 			g_free(nm);
 		}
-
-		g_free(what);
 	}
 
 	if ((c->is_chat && (chat_options & OPT_CHAT_POPUP)) ||

Index: multi.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- multi.h	2001/12/22 03:38:19	1.38
+++ multi.h	2001/12/22 08:08:36	1.39
@@ -74,7 +74,6 @@
 };
 
 #define OPT_CONN_HTML		0x00000001
-#define OPT_CONN_SHOW_HTML	0x00000002
 
 struct proto_user_opt {
 	char *label;

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv2508/src

Modified Files:
	away.c buddy.c dialogs.c gaim.h gaimrc.c prefs.c proxy.c 
	server.c ui.h 
Log Message:
save
save me from this
wandered around the town
all the thousand things
i might miss

and you
think we'll suffer much
think we'll close our eyes
just to see the light
pass us by

with tomorrow coming
hope that i don't let you
down again
said i'm so glad to be here
does it mean a thing
if only i could breathe what you breathe
if only i could see what you see

sit
we'll take our time
watching the flowers grow
all the friends we've known
say goodbye 

and you
did you suffer much
did you close your eyes
just to see the night
rush on by

gathered all around you
hope that we don't let you
down again
i said i'm so glad to be here
does it mean a thing
if only i could breathe what you breathe
if only i could see what you see 

i said i'm so glad to be here
does it mean a thing

if only i could breathe what you breathe
if only i could see what you see 
if only i could just believe a thing

--Moist, "Breathe" (as transcribed by http://www.veddma.com/veddma/moist.htm)

Patches from:
Ari Pollak
Ben Miller
Mark Doliner
Sean Egan
Vincas Ciziunas

Thanks everyone.

Somewhere in the middle of all of this it started to get really tedious and annoying. I think it's getting close to the point where I quit.


Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- away.c	2001/12/08 09:48:51	1.68
+++ away.c	2001/12/21 10:23:04	1.69
@@ -219,6 +219,8 @@
 
 		awaytext = gtk_imhtml_new(NULL, NULL);
 		gtk_container_add(GTK_CONTAINER(sw), awaytext);
+		GTK_LAYOUT(awaytext)->hadjustment->step_increment = 10.0;
+		GTK_LAYOUT(awaytext)->vadjustment->step_increment = 10.0;
 		gaim_setup_imhtml(awaytext);
 		gtk_widget_show(awaytext);
 		buf = stylize(a->message, BUF_LONG);

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- buddy.c	2001/12/14 20:39:26	1.282
+++ buddy.c	2001/12/21 10:23:04	1.283
@@ -2113,6 +2113,14 @@
 					char tmp[1024];
 					g_snprintf(tmp, sizeof(tmp), _("%s logged in."), b->name);
 					write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
+				} else if (clistqueue && find_queue_total_by_name(b->name)) {
+					struct queued_message *qm = g_new0(struct queued_message, 1);
+					qm->message = g_strdup_printf(_("%s logged in."), b->name);
+					qm->gc = gc;
+					qm->tm = time(NULL);
+					qm->flags = WFLAG_SYSTEM;
+					qm->len = -1;
+					message_queue = g_slist_append(message_queue, qm);
 				}
 			}
 			bs->sound = 2;
@@ -2168,6 +2176,14 @@
 				char tmp[1024];
 				g_snprintf(tmp, sizeof(tmp), _("%s logged out."), b->name);
 				write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time(NULL), -1);
+			} else if (clistqueue && find_queue_total_by_name(b->name)) {
+				struct queued_message *qm = g_new0(struct queued_message, 1);
+				qm->message = g_strdup_printf(_("%s logged out."), b->name);
+				qm->gc = gc;
+				qm->tm = time(NULL);
+				qm->flags = WFLAG_SYSTEM;
+				qm->len = -1;
+				message_queue = g_slist_append(message_queue, qm);
 			}
 		}
 

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- dialogs.c	2001/12/08 09:48:51	1.296
+++ dialogs.c	2001/12/21 10:23:04	1.297
@@ -1853,8 +1853,6 @@
 		 gtk_imhtml_append_text(GTK_IMHTML(b->text), more_info, -1, options);
 	va_end(ap);
 
-	gtk_imhtml_append_text(GTK_IMHTML(b->text), "<BR>", -1, 0);
-
 	if (away)
 		info_dlgs = g_slist_remove(info_dlgs, b);
 	else
@@ -3769,6 +3767,8 @@
 
 	gtk_signal_connect(GTK_OBJECT(layout), "url_clicked", GTK_SIGNAL_FUNC(open_url), NULL);
 	gtk_container_add(GTK_CONTAINER(sw), layout);
+	GTK_LAYOUT(layout)->hadjustment->step_increment = 10.0;
+	GTK_LAYOUT(layout)->vadjustment->step_increment = 10.0;
 	gaim_setup_imhtml(layout);
 
 	gtk_box_pack_start(GTK_BOX(box), bbox, FALSE, FALSE, 0);

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -d -r1.303 -r1.304
--- gaim.h	2001/12/08 09:48:51	1.303
+++ gaim.h	2001/12/21 10:23:04	1.304
@@ -307,7 +307,9 @@
 #define OPT_AWAY_AUTO			0x00000008
 #define OPT_AWAY_NO_AUTO_RESP		0x00000010
 #define OPT_AWAY_QUEUE			0x00000020
+#define OPT_AWAY_IDLE_RESP		0x00000040
 
+extern guint away_resend;
 extern int report_idle;
 extern int web_browser;
 extern GSList *aim_users;

Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- gaimrc.c	2001/11/20 06:16:15	1.90
+++ gaimrc.c	2001/12/21 10:23:04	1.91
@@ -49,6 +49,7 @@
 guint font_options;
 guint sound_options;
 guint away_options;
+guint away_resend;
 
 int report_idle, web_browser;
 struct save_pos blist_pos;
@@ -731,6 +732,7 @@
 			sound_options = atoi(p->value[0]);
 		} else if (!strcmp(p->option, "away_options")) {
 			away_options = atoi(p->value[0]);
+			away_resend = atoi(p->value[1]);
 		} else if (!strcmp(p->option, "font_xfld")) {
 			g_snprintf(fontxfld, sizeof(fontxfld), "%s", p->value[0]);
 		} else if (!strcmp(p->option, "font_face")) {
@@ -807,6 +809,9 @@
 		for (i = 0; disp_replace[i].val; i++)
 			if (display_options & disp_replace[i].old)
 				*disp_replace[i].val |= disp_replace[i].new;
+
+	if (!away_resend)
+		away_resend = 120;
 }
 
 static void gaimrc_write_options(FILE *f)

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- prefs.c	2001/12/08 09:48:52	1.211
+++ prefs.c	2001/12/21 10:23:04	1.212
@@ -829,7 +829,7 @@
 	*value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(spin));
 }
 
-static void gaim_labeled_spin_button(GtkWidget *box, const gchar *title, int *val)
+static void gaim_labeled_spin_button(GtkWidget *box, const gchar *title, int *val, int min, int max)
 {
 	GtkWidget *hbox;
 	GtkWidget *label;
@@ -844,7 +844,7 @@
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
 	gtk_widget_show(label);
 
-	adjust = gtk_adjustment_new(*val, 1, 9999, 1, 1, 1);
+	adjust = gtk_adjustment_new(*val, min, max, 1, 1, 1);
 	spin = gtk_spin_button_new(GTK_ADJUSTMENT(adjust), 1, 0);
 	gtk_object_set_user_data(GTK_OBJECT(spin), val);
 	gtk_widget_set_usize(spin, 50, -1);
@@ -949,9 +949,9 @@
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 	gtk_widget_show(vbox);
 
-	gaim_labeled_spin_button(vbox, _("New window width:"), &conv_size.width);
-	gaim_labeled_spin_button(vbox, _("New window height:"), &conv_size.height);
-	gaim_labeled_spin_button(vbox, _("Entry widget height:"), &conv_size.entry_height);
+	gaim_labeled_spin_button(vbox, _("New window width:"), &conv_size.width, 25, 9999);
+	gaim_labeled_spin_button(vbox, _("New window height:"), &conv_size.height, 25, 9999);
+	gaim_labeled_spin_button(vbox, _("Entry widget height:"), &conv_size.entry_height, 25, 9999);
 
 	frame = gtk_frame_new(_("Tab Placement"));
 	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
@@ -1093,9 +1093,9 @@
 	gtk_container_add(GTK_CONTAINER(frame), vbox);
 	gtk_widget_show(vbox);
 
-	gaim_labeled_spin_button(vbox, _("New window width:"), &buddy_chat_size.width);
-	gaim_labeled_spin_button(vbox, _("New window height:"), &buddy_chat_size.height);
-	gaim_labeled_spin_button(vbox, _("Entry widget height:"), &buddy_chat_size.entry_height);
+	gaim_labeled_spin_button(vbox, _("New window width:"), &buddy_chat_size.width, 25, 9999);
+	gaim_labeled_spin_button(vbox, _("New window height:"), &buddy_chat_size.height, 25, 9999);
+	gaim_labeled_spin_button(vbox, _("Entry widget height:"), &buddy_chat_size.entry_height, 25, 9999);
 
 	frame = gtk_frame_new(_("Tab Placement"));
 	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
@@ -1823,11 +1823,12 @@
 	GtkWidget *vbox;
 	GtkWidget *hbox;
 	GtkWidget *vbox2;
+	GtkWidget *button;
+	GtkWidget *button2;
 	GtkWidget *top;
 	GtkWidget *bot;
 	GtkWidget *sw;
 	GtkWidget *sw2;
-	GtkWidget *button;
 	GtkWidget *list_item;
 	GtkWidget *sep;
 	GtkObject *adjust;
@@ -1875,7 +1876,12 @@
 	gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 5);
 	gtk_widget_show(vbox2);
 
-	gaim_button(_("Don't send auto-response"), &away_options, OPT_AWAY_NO_AUTO_RESP, vbox2);
+	button = gaim_button(_("Don't send auto-response"), &away_options, OPT_AWAY_NO_AUTO_RESP, vbox2);
+	button2 = gaim_button(_("Only send auto-response when idle"), &away_options, OPT_AWAY_IDLE_RESP,
+			      vbox2);
+	if (away_options & OPT_AWAY_NO_AUTO_RESP)
+		gtk_widget_set_sensitive(button2, FALSE);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), button2);
 	gaim_button(_("Queue new messages when away"), &away_options, OPT_AWAY_QUEUE, vbox2);
 
 	sep = gtk_hseparator_new();
@@ -1886,6 +1892,21 @@
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show(hbox);
 
+	gaim_labeled_spin_button(hbox, _("Time between sending auto-responses (in seconds):"),
+			&away_resend, 1, 24 * 60 * 60);
+
+	if (away_options & OPT_AWAY_NO_AUTO_RESP)
+		gtk_widget_set_sensitive(hbox, FALSE);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), hbox);
+
+	sep = gtk_hseparator_new();
+	gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
+	gtk_widget_show(sep);
+
+	hbox = gtk_hbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+	gtk_widget_show(hbox);
+
 	button = gaim_button(_("Auto Away after"), &away_options, OPT_AWAY_AUTO, hbox);
 
 	adjust = gtk_adjustment_new(auto_away, 1, 1440, 1, 10, 10);
@@ -1957,6 +1978,8 @@
 
 	away_text = gtk_imhtml_new(NULL, NULL);
 	gtk_container_add(GTK_CONTAINER(sw2), away_text);
+	GTK_LAYOUT(away_text)->hadjustment->step_increment = 10.0;
+	GTK_LAYOUT(away_text)->vadjustment->step_increment = 10.0;
 	gaim_setup_imhtml(away_text);
 	gtk_widget_show(away_text);
 

Index: proxy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/proxy.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- proxy.c	2001/12/20 21:01:59	1.36
+++ proxy.c	2001/12/21 10:23:04	1.37
@@ -33,6 +33,7 @@
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -118,6 +119,24 @@
 		g_source_remove(tag);
 }
 
+static struct sockaddr_in *gaim_gethostbyname(char *host)
+{
+	static struct sockaddr_in sin;
+
+	if (!inet_aton(host, &sin.sin_addr)) {
+		struct hostent *hp;
+		if (!(hp = gethostbyname(host))) {
+			return NULL;
+		}
+		memset(&sin, 0, sizeof(struct sockaddr_in));
+		memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
+		sin.sin_family = hp->h_addrtype;
+	} else
+		sin.sin_family = AF_INET;
+
+	return &sin;
+}
+
 static void no_one_calls(gpointer data, gint source, GaimInputCondition cond)
 {
 	struct PHB *phb = data;
@@ -151,31 +170,25 @@
 
 static int proxy_connect_none(char *host, unsigned short port, struct PHB *phb)
 {
-	struct sockaddr_in sin;
-	struct hostent *hp;
+	struct sockaddr_in *sin;
 	int fd = -1;
 
 	debug_printf("connecting to %s:%d with no proxy\n", host, port);
 
-	if (!(hp = gethostbyname(host))) {
+	if (!(sin = gaim_gethostbyname(host))) {
 		debug_printf("gethostbyname failed\n");
 		g_free(phb);
 		return -1;
 	}
-
-	memset(&sin, 0, sizeof(struct sockaddr_in));
-	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
-	sin.sin_family = hp->h_addrtype;
-	sin.sin_port = htons(port);
 
-	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
+	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
 		debug_printf("unable to create socket\n");
 		g_free(phb);
 		return -1;
 	}
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, no_one_calls, phb);
@@ -302,23 +315,17 @@
 
 static int proxy_connect_http(char *host, unsigned short port, struct PHB *phb)
 {
-	struct hostent *hp;
-	struct sockaddr_in sin;
+	struct sockaddr_in *sin;
 	int fd = -1;
 
 	debug_printf("connecting to %s:%d via %s:%d using HTTP\n", host, port, proxyhost, proxyport);
 
-	if (!(hp = gethostbyname(proxyhost))) {
+	if (!(sin = gaim_gethostbyname(proxyhost))) {
 		g_free(phb);
 		return -1;
 	}
 
-	memset(&sin, 0, sizeof(struct sockaddr_in));
-	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
-	sin.sin_family = hp->h_addrtype;
-	sin.sin_port = htons(proxyport);
-
-	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
+	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
 		g_free(phb);
 		return -1;
 	}
@@ -327,7 +334,7 @@
 	phb->port = port;
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, http_canwrite, phb);
@@ -427,23 +434,17 @@
 
 static int proxy_connect_socks4(char *host, unsigned short port, struct PHB *phb)
 {
-	struct sockaddr_in sin;
-	struct hostent *hp;
+	struct sockaddr_in *sin;
 	int fd = -1;
 
 	debug_printf("connecting to %s:%d via %s:%d using SOCKS4\n", host, port, proxyhost, proxyport);
 
-	if (!(hp = gethostbyname(proxyhost))) {
+	if (!(sin = gaim_gethostbyname(proxyhost))) {
 		g_free(phb);
 		return -1;
 	}
-
-	memset(&sin, 0, sizeof(struct sockaddr_in));
-	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
-	sin.sin_family = hp->h_addrtype;
-	sin.sin_port = htons(proxyport);
 
-	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
+	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
 		g_free(phb);
 		return -1;
 	}
@@ -452,7 +453,7 @@
 	phb->port = port;
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, s4_canwrite, phb);
@@ -656,23 +657,17 @@
 
 static int proxy_connect_socks5(char *host, unsigned short port, struct PHB *phb)
 {
+	struct sockaddr_in *sin;
 	int fd = -1;
-	struct sockaddr_in sin;
-	struct hostent *hp;
 
 	debug_printf("connecting to %s:%d via %s:%d using SOCKS5\n", host, port, proxyhost, proxyport);
 
-	if (!(hp = gethostbyname(proxyhost))) {
+	if (!(sin = gaim_gethostbyname(proxyhost))) {
 		g_free(phb);
 		return -1;
 	}
 
-	memset(&sin, 0, sizeof(struct sockaddr_in));
-	memcpy(&sin.sin_addr.s_addr, hp->h_addr, hp->h_length);
-	sin.sin_family = hp->h_addrtype;
-	sin.sin_port = htons(proxyport);
-
-	if ((fd = socket(hp->h_addrtype, SOCK_STREAM, 0)) < 0) {
+	if ((fd = socket(sin->sin_family, SOCK_STREAM, 0)) < 0) {
 		g_free(phb);
 		return -1;
 	}
@@ -681,7 +676,7 @@
 	phb->port = port;
 
 	fcntl(fd, F_SETFL, O_NONBLOCK);
-	if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
 		if ((errno == EINPROGRESS) || (errno == EINTR)) {
 			debug_printf("Connect would have blocked\n");
 			phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, s5_canwrite, phb);

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- server.c	2001/12/08 09:48:52	1.214
+++ server.c	2001/12/21 10:23:04	1.215
@@ -584,7 +584,8 @@
 
 		/* regardless of whether we queue it or not, we should send an auto-response. That is,
 		 * of course, unless the horse.... no wait. */
-		if ((away_options & OPT_AWAY_NO_AUTO_RESP) || !strlen(gc->away)) {
+		if ((away_options & OPT_AWAY_NO_AUTO_RESP) || !strlen(gc->away) ||
+				((away_options & OPT_AWAY_IDLE_RESP) && !gc->is_idle)) {
 			g_free(name);
 			g_free(message);
 			return;
@@ -602,7 +603,7 @@
 			qar->sent_away = 0;
 			away_time_queue = g_slist_append(away_time_queue, qar);
 		}
-		if ((t - qar->sent_away) < 120) {
+		if ((t - qar->sent_away) < away_resend) {
 			g_free(name);
 			g_free(message);
 			return;
@@ -978,6 +979,8 @@
 
 	text = gtk_imhtml_new(NULL, NULL);
 	gtk_container_add(GTK_CONTAINER(sw), text);
+	GTK_LAYOUT(text)->hadjustment->step_increment = 10.0;
+	GTK_LAYOUT(text)->vadjustment->step_increment = 10.0;
 	gaim_setup_imhtml(text);
 
 	hbox = gtk_hbox_new(FALSE, 5);

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ui.h	2001/12/14 18:08:24	1.26
+++ ui.h	2001/12/21 10:23:04	1.27
@@ -443,6 +443,10 @@
 /* Functions in prpl.c */
 extern void register_dialog();
 
+/* Functions in server.c */
+/* server.c is in desperate need need of a split */
+extern int find_queue_total_by_name(char *);
+
 /* Functions in sound.c */
 extern void play_sound(int);
 extern void play_file(char *);

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv2508/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
save
save me from this
wandered around the town
all the thousand things
i might miss

and you
think we'll suffer much
think we'll close our eyes
just to see the light
pass us by

with tomorrow coming
hope that i don't let you
down again
said i'm so glad to be here
does it mean a thing
if only i could breathe what you breathe
if only i could see what you see

sit
we'll take our time
watching the flowers grow
all the friends we've known
say goodbye 

and you
did you suffer much
did you close your eyes
just to see the night
rush on by

gathered all around you
hope that we don't let you
down again
i said i'm so glad to be here
does it mean a thing
if only i could breathe what you breathe
if only i could see what you see 

i said i'm so glad to be here
does it mean a thing

if only i could breathe what you breathe
if only i could see what you see 
if only i could just believe a thing

--Moist, "Breathe" (as transcribed by http://www.veddma.com/veddma/moist.htm)

Patches from:
Ari Pollak
Ben Miller
Mark Doliner
Sean Egan
Vincas Ciziunas

Thanks everyone.

Somewhere in the middle of all of this it started to get really tedious and annoying. I think it's getting close to the point where I quit.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- oscar.c	2001/12/10 06:13:18	1.85
+++ oscar.c	2001/12/21 10:23:04	1.86
@@ -1904,6 +1904,8 @@
 			aim_conn_setlatency(fr->conn, 0);
 	} else if (code == AIM_RATE_CODE_WARNING) {
 		aim_conn_setlatency(fr->conn, windowsize/4);
+		do_error_dialog(_("The last message was not sent because you are over the rate limit. "
+				  "Please wait 10 seconds and try again."), _("Gaim - Error"));
 	} else if (code == AIM_RATE_CODE_LIMIT) {
 		aim_conn_setlatency(fr->conn, windowsize/2);
 	} else if (code == AIM_RATE_CODE_CLEARLIMIT) {

Update of /cvsroot/gaim/gaim/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv2508/plugins

Modified Files:
	filectl.c spellchk.c 
Log Message:
save
save me from this
wandered around the town
all the thousand things
i might miss

and you
think we'll suffer much
think we'll close our eyes
just to see the light
pass us by

with tomorrow coming
hope that i don't let you
down again
said i'm so glad to be here
does it mean a thing
if only i could breathe what you breathe
if only i could see what you see

sit
we'll take our time
watching the flowers grow
all the friends we've known
say goodbye 

and you
did you suffer much
did you close your eyes
just to see the night
rush on by

gathered all around you
hope that we don't let you
down again
i said i'm so glad to be here
does it mean a thing
if only i could breathe what you breathe
if only i could see what you see 

i said i'm so glad to be here
does it mean a thing

if only i could breathe what you breathe
if only i could see what you see 
if only i could just believe a thing

--Moist, "Breathe" (as transcribed by http://www.veddma.com/veddma/moist.htm)

Patches from:
Ari Pollak
Ben Miller
Mark Doliner
Sean Egan
Vincas Ciziunas

Thanks everyone.

Somewhere in the middle of all of this it started to get really tedious and annoying. I think it's getting close to the point where I quit.


Index: filectl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/filectl.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- filectl.c	2001/11/19 13:50:34	1.7
+++ filectl.c	2001/12/21 10:23:03	1.8
@@ -77,7 +77,7 @@
 			arg2 = getarg(buffer, 2, 1);
 			c = find_conversation(arg1);
 			if (!c) c = new_conversation(arg1);
-			write_to_conv(c, arg2, WFLAG_SEND, NULL, time(NULL));
+			write_to_conv(c, arg2, WFLAG_SEND, NULL, time(NULL), -1);
 			serv_send_im(c->gc, arg1, arg2, 0);
 			free(arg1);
 			free(arg2);

Index: spellchk.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/spellchk.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- spellchk.c	2001/11/15 22:47:03	1.21
+++ spellchk.c	2001/12/21 10:23:03	1.22
@@ -360,6 +360,7 @@
 	GAIM_DIALOG(configwin);
 	gtk_widget_set_usize(configwin, 450, 250);
 	gtk_window_set_title(GTK_WINDOW(configwin), "Spell Check Config");
+	gtk_signal_connect(GTK_OBJECT(configwin), "destroy", GTK_SIGNAL_FUNC(close_config), NULL);
 
 	vbox = gtk_vbox_new(0, 2);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 4);

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv15875

Modified Files:
	README 
Log Message:
eh


Index: README
===================================================================
RCS file: /cvsroot/gaim/gaim/README,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- README	2001/12/21 22:50:52	1.25
+++ README	2001/12/22 00:31:01	1.26
@@ -46,9 +46,9 @@
 
 They are installed in $libdir/gaim, which usually is either /usr/lib/gaim
 or /usr/local/lib/gaim, and should have a somewhat descriptive name (e.g.
-libyahoo.so or irc.so). Load those plugins using the normal plugin dialog.
-Then in the account editor, add a new account; the Protocol option menu
-should now have another option for the protocol that you loaded. Then
+libyahoo.so or libirc.so). Load those plugins using the normal plugin
+dialog.  Then in the account editor, add a new account; the Protocol option
+menu should now have another option for the protocol that you loaded. Then
 you can sign that account on.
 
 Read below for protocol-specific information.