Changes 1.1.0:

New Features:
* Binary relocable. Gaim will find its files even if it's installed
  in a location other than the --prefix it was ./configured with.
  Pass --disable-binreloc to ./configure to disable.
* IRC now has fallback encodings, and tries harder to display
  something useful during an encoding error.
* New MSN protocol icon (Felipe Contreras)

Bug Fixes:
* Fix some leaks (Miah Gregory, Felipe Contreras)
* Fix crashes when removing buddies in certain situations (Andrew Hart)
* Eliminate MSN switchboard errors (Felipe Contreras)
* Fix MSN buddy icon syncronization (Felipe Contreras)
* Correctly display file transfer dialogs for filenames containing &, < or >
* Correctly display MSN authorization dialogs for friendly names containing
  &, < or >
* Properly align the right-click docklet menu with the docklet icon in
  *nix.
* Fix a crash if the MSN buddy list is not available
* Fix a bug in the request api (Gary Kramlich)

6 files changed, 25 insertions, 44 deletions

diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index b72cc6ada40..6f41750d5cb 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,27 +1,25 @@
-# $NetBSD: Makefile,v 1.74 2004/11/13 08:05:53 grant Exp $
-#
+# $NetBSD: Makefile,v 1.75 2004/12/03 12:43:24 adam Exp $
 
-DISTNAME=		gaim-1.0.3
-PKGREVISION=		1
-CATEGORIES=		chat x11
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gaim/}
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	gaim-1.1.0
+CATEGORIES=	chat x11
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gaim/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=		mjl@luckie.org.nz
-HOMEPAGE=		http://gaim.sourceforge.net/
-COMMENT=		GTK+ 2.x based multi-protocol instant messaging client
+MAINTAINER=	mjl@luckie.org.nz
+HOMEPAGE=	http://gaim.sourceforge.net/
+COMMENT=	GTK+ 2.x based multi-protocol instant messaging client
 
 BUILD_USES_MSGFMT=	YES
 
 CONFLICTS+=		gaim-gnome-[0-9]*
 
-GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
 USE_DIRS+=		xdg-1.1
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
+GNU_CONFIGURE=		YES
 
 SHLIBTOOL_OVERRIDE=	libtool
 
diff --git a/chat/gaim/PLIST b/chat/gaim/PLIST
index 354ae77ca68..04ade06b8d9 100644
--- a/chat/gaim/PLIST
+++ b/chat/gaim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2004/11/13 08:05:53 grant Exp $
+@comment $NetBSD: PLIST,v 1.36 2004/12/03 12:43:24 adam Exp $
 bin/gaim
 bin/gaim-remote
 include/gaim/account.h
@@ -50,6 +50,7 @@ include/gaim/notify.h
 include/gaim/plugin.h
 include/gaim/pluginpref.h
 include/gaim/pounce.h
+include/gaim/prefix.h
 include/gaim/prefs.h
 include/gaim/privacy.h
 include/gaim/proxy.h
@@ -134,6 +135,7 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gaim.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gaim.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gaim.mo
@@ -356,6 +358,7 @@ share/pixmaps/gaim/status/default/admin.png
 share/pixmaps/gaim/status/default/aim.png
 share/pixmaps/gaim/status/default/aol.png
 share/pixmaps/gaim/status/default/away.png
+share/pixmaps/gaim/status/default/blocked.png
 share/pixmaps/gaim/status/default/dnd.png
 share/pixmaps/gaim/status/default/extendedaway.png
 share/pixmaps/gaim/status/default/female.png
@@ -378,6 +381,7 @@ share/pixmaps/gaim/status/default/na.png
 share/pixmaps/gaim/status/default/napster.png
 share/pixmaps/gaim/status/default/notauthorized.png
 share/pixmaps/gaim/status/default/novell.png
+share/pixmaps/gaim/status/default/nr.png
 share/pixmaps/gaim/status/default/occupied.png
 share/pixmaps/gaim/status/default/offline.png
 share/pixmaps/gaim/status/default/op.png
diff --git a/chat/gaim/distinfo b/chat/gaim/distinfo
index 410847eaf29..fd80d79d16d 100644
--- a/chat/gaim/distinfo
+++ b/chat/gaim/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.54 2004/11/16 19:49:42 ben Exp $
+$NetBSD: distinfo,v 1.55 2004/12/03 12:43:24 adam Exp $
 
-SHA1 (gaim-1.0.3.tar.bz2) = 1befd3c562ebe3564a2bf606b9937b2de5d3e0c8
-Size (gaim-1.0.3.tar.bz2) = 4810182 bytes
-SHA1 (patch-aa) = 24f1b21042df5c7706dcf3def37e10943acdd39e
-SHA1 (patch-ab) = 103e2ae5fb77154a22b42b5f59e1fc13cd4e2218
+SHA1 (gaim-1.1.0.tar.bz2) = 378fefb19c7b9dcdd2df2a502460e14ea5a01a89
+Size (gaim-1.1.0.tar.bz2) = 4849702 bytes
+SHA1 (patch-aa) = 80834ca5fdbc864e98c0179248e446bee24681c5
 SHA1 (patch-ac) = 9cb0f91f58a556f44de84819e9c15083f012abbc
-SHA1 (patch-ad) = 5fe68b8d47498d335a787b29c1ad14774864c166
+SHA1 (patch-ad) = e3c71479caeeebe287bcd063e5b8e470832a0c08
diff --git a/chat/gaim/patches/patch-aa b/chat/gaim/patches/patch-aa
index 53b23f7afab..7e305b935a2 100644
--- a/chat/gaim/patches/patch-aa
+++ b/chat/gaim/patches/patch-aa
@@ -1,10 +1,8 @@
-$NetBSD: patch-aa,v 1.22 2004/06/03 19:13:02 minskim Exp $
+$NetBSD: patch-aa,v 1.23 2004/12/03 12:43:24 adam Exp $
 
-Workaround for http://bugzilla.gnome.org/show_bug.cgi?id=62948
-
---- src/gtkconv.c.orig	2004-05-30 11:44:45.000000000 -0500
+--- src/gtkconv.c.orig	2004-11-27 19:25:41.000000000 +0000
 +++ src/gtkconv.c
-@@ -1478,6 +1478,11 @@ entry_key_press_cb(GtkWidget *entry, Gdk
+@@ -1804,6 +1804,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"))
  				{
diff --git a/chat/gaim/patches/patch-ab b/chat/gaim/patches/patch-ab
deleted file mode 100644
index be0f8084457..00000000000
--- a/chat/gaim/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.12 2004/11/12 22:58:25 jmmv Exp $
-
---- src/log.c.orig	2004-11-11 20:11:43.000000000 +0100
-+++ src/log.c
-@@ -74,11 +74,12 @@ void gaim_log_free(GaimLog *log)
- void gaim_log_write(GaimLog *log, GaimMessageFlags type,
- 		    const char *from, time_t time, const char *message)
- {
-+	struct _gaim_logsize_user *lu;
-+
- 	g_return_if_fail(log);
- 	g_return_if_fail(log->logger);
- 	g_return_if_fail(log->logger->write);
- 
--	struct _gaim_logsize_user *lu;
- 	(log->logger->write)(log, type, from, time, message);
- 
- 	lu = g_new(struct _gaim_logsize_user, 1);
diff --git a/chat/gaim/patches/patch-ad b/chat/gaim/patches/patch-ad
index 9791186e498..e7579e21127 100644
--- a/chat/gaim/patches/patch-ad
+++ b/chat/gaim/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2004/11/16 19:49:42 ben Exp $
+$NetBSD: patch-ad,v 1.6 2004/12/03 12:43:24 adam Exp $
 
---- configure.orig	Thu Nov 11 20:54:53 2004
+--- configure.orig	2004-12-03 04:24:48.000000000 +0000
 +++ configure
-@@ -27815,7 +27815,7 @@ fi
+@@ -27839,7 +27839,7 @@ fi
  	if test "$ac_silc_libs" != "no"; then
  		SILC_LIBS="-L$ac_silc_libs"
  	fi