# HG changeset patch
# User Eric Warmenhoven <warmenhoven@yahoo.com>
# Date 1006144539 0
# Node ID 1deb656ee517261d3af9568b6d169f99e9968a4a
# Parent  6af602415d9387aaef7c0b461b701fc1a780f860
[gaim-migrate @ 2767]
lisa started putting up the christmas decorations today.

diff -r 6af602415d93 -r 1deb656ee517 autogen.sh
--- a/autogen.sh	Mon Nov 19 04:09:58 2001 +0000
+++ b/autogen.sh	Mon Nov 19 04:35:39 2001 +0000
@@ -39,14 +39,14 @@
 echo;
 
 echo "Running gettextize, please ignore non-fatal messages...."
-echo n | gettextize --copy --force;
+echo n | gettextize --copy --force || exit;
 echo "Running libtoolize, please ignore non-fatal messages...."
-echo n | libtoolize --copy --force;
+echo n | libtoolize --copy --force || exit;
 
-aclocal -I m4 $ACLOCAL_FLAGS;
-autoheader;
-automake --add-missing --copy;
-autoconf;
-automake;
+aclocal -I m4 $ACLOCAL_FLAGS || exit;
+autoheader || exit;
+automake --add-missing --copy || exit;
+autoconf || exit;
+automake || exit;
 ./configure $@
 
diff -r 6af602415d93 -r 1deb656ee517 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Mon Nov 19 04:09:58 2001 +0000
+++ b/src/protocols/oscar/oscar.c	Mon Nov 19 04:35:39 2001 +0000
@@ -518,6 +518,12 @@
 		odata->hasicons = g_slist_remove(odata->hasicons, n);
 		g_free(n);
 	}
+	if (odata->create_name)
+		g_free(odata->create_name);
+	if (odata->newp)
+		g_free(odata->newp);
+	if (odata->oldp)
+		g_free(odata->oldp);
 	if (gc->inpa > 0)
 		gaim_input_remove(gc->inpa);
 	if (odata->cnpa > 0)
diff -r 6af602415d93 -r 1deb656ee517 src/proxy.c
--- a/src/proxy.c	Mon Nov 19 04:09:58 2001 +0000
+++ b/src/proxy.c	Mon Nov 19 04:35:39 2001 +0000
@@ -74,7 +74,7 @@
 
 	if (condition & GAIM_READ_COND)
 		gaim_cond |= GAIM_INPUT_READ;
-	if (condition & GAIM_READ_COND)
+	if (condition & GAIM_WRITE_COND)
 		gaim_cond |= GAIM_INPUT_WRITE;
 
 	debug_printf("CLOSURE: callback for %d, fd is %d\n",