Mercurial > pidgin
changeset 2754:642413968b03
[gaim-migrate @ 2767]
lisa started putting up the christmas decorations today.
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Mon, 19 Nov 2001 04:35:39 +0000 |
| parents | 9ed09c48131b |
| children | adbda5d9b50c |
| files | autogen.sh src/protocols/oscar/oscar.c src/proxy.c |
| diffstat | 3 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- 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 $@
--- 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)
--- 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",