Changes 1.1.2:

	Luke: Another Bug fix release. This one featuring a fix to the HTTP
	Method for MSN users and other MSN fixes. A big thanks to Stu and
	Felipe Contreras for those. Stu also spent a long time in valgrind
	and so this brings you a Gaim release with fewer memory leaks. This
	release is on time primarily because I want to see the MSN fixes
	make it into Debian and Fedora before freezes. Expect further bug
	fix only releases to come at longer intervals, at Mark's request.

	Daniel: This is my first NEWS! (YaY) I didn't really do too much for
	this release.  There are a few bugfixes, mostly wingaim stuff. Oh, and
	I like the new XP System Tray icons.

	Sean: I'm down here today. I haven't really been paying too much
	attention to these boring bugfix releases, but I'd like to thank
	David and welcome him to the team. I'd also like to thank Steven
	and Nathan from Silverorange who redid the webpage.

	Tim: Another bug fix release. I didn't really fix any bugs, so
	I didn't exactly do much for this one. The autopackage will now
	work with mozilla-nss, if anyone has that, and not gnutls11. (It
	works with either gnutls11 or mozilla-nss, but not gnutls10)
	I started working on Gaim-vv again though, and I merged someone's
	custom msn smiley patch into the 2.0.0 tree, so expect good things
	whenever that's released (no, don't try it now, you won't like it).
	Oh and welcome to the team Daniel. Of course, he was already on my
	Gaim-vv team.

	Stu: Welcome Daniel! you've done some good stuff already. Felipe did some
	good work on MSN yet again, so you can all use the HTTP method now. I
	didn't do all that much, other than let valgrind tell me what to fix, and
	a couple of easy bug fixes from the bug tracker. Hopefully Ethan will get
	well soon, so he can get back to merging patches and fixing things.

	Nathan: I think I made some Jabber fixes, at least one of which is
	ChangeLog'd.  I will continue to make empty promises about new features,
	especially for 2.0.0.  Until then, welcome Daniel!

3 files changed, 9 insertions, 9 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index b8f25572e2d..0da4e6a6086 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.77 2005/01/04 09:02:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.78 2005/01/21 13:26:42 adam Exp $
 
-DISTNAME=	gaim-1.1.1
+DISTNAME=	gaim-1.1.2
 CATEGORIES=	chat x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 6a735e5f553..8bb172c333e 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.56 2005/01/04 09:02:39 jmmv Exp $
+$NetBSD: distinfo,v 1.57 2005/01/21 13:26:42 adam Exp $
 
-SHA1 (gaim-1.1.1.tar.bz2) = e2d0862a70c0865ea5e6d124234110dca067e075
-Size (gaim-1.1.1.tar.bz2) = 5163396 bytes
-SHA1 (patch-aa) = 80834ca5fdbc864e98c0179248e446bee24681c5
+SHA1 (gaim-1.1.2.tar.bz2) = 6e829261e04d3da95ccfbfb07cc1164c5c725231
+Size (gaim-1.1.2.tar.bz2) = 5178791 bytes
+SHA1 (patch-aa) = 555c394dbb4cd9ef4fea621d30ce72baae309067
 SHA1 (patch-ac) = 9cb0f91f58a556f44de84819e9c15083f012abbc
 SHA1 (patch-ad) = e3c71479caeeebe287bcd063e5b8e470832a0c08
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
index 7e305b935a2..ec646570360 100644
--- a/chat/gaim/patches/patch-aa
+++ b/chat/gaim/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.23 2004/12/03 12:43:24 adam Exp $
+$NetBSD: patch-aa,v 1.24 2005/01/21 13:26:42 adam Exp $
 
---- src/gtkconv.c.orig	2004-11-27 19:25:41.000000000 +0000
+--- src/gtkconv.c.orig	2005-01-11 17:27:23.000000000 +0000
 +++ src/gtkconv.c
-@@ -1804,6 +1804,11 @@ entry_key_press_cb(GtkWidget *entry, Gdk
+@@ -1808,6 +1808,11 @@ entry_key_press_cb(GtkWidget *entry, Gdk
  				if (!(event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) &&
  					gaim_prefs_get_bool("/gaim/gtk/conversations/enter_sends"))
  				{