Update to 0.76. For a list of what's new and exciting, see:

http://gaim.sourceforge.net/ChangeLog

Also, provide a better fix for quoted printable text. [1]

PR:		65110 [1]
Submitted by:	green [1]

9 files changed, 126 insertions, 517 deletions

diff --git a/net/gaim/Makefile b/net/gaim/Makefile
index 3c56d2e58a0a..b4cd411ba60f 100644
--- a/net/gaim/Makefile
+++ b/net/gaim/Makefile
@@ -5,8 +5,7 @@
 #
 
 PORTNAME=	gaim
-PORTVERSION=	0.75
-PORTREVISION=	8
+PORTVERSION=	0.76
 CATEGORIES?=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -72,8 +71,8 @@ CONFIGURE_ARGS+=	--disable-gtkspell
 .if defined(TCL_VER)
 _TCL_DVER=	${TCL_VER:S/.//}
 _TCL_VER=	${_TCL_DVER:C/(.)/\1./}
-.if ${_TCL_VER} != 8.3
-.	error Currently GAIM can only use Tcl/Tk 8.3
+.if ${_TCL_VER} != 8.3 && ${_TCL_VER} != 8.4
+.	error Currently GAIM can only use Tcl/Tk 8.3 or 8.4
 .endif
 LIB_DEPENDS+=	tk${_TCL_DVER}:${PORTSDIR}/x11-toolkits/tk${_TCL_DVER}
 CONFIGURE_ARGS+=--with-tclconfig=${LOCALBASE}/lib/tcl${_TCL_VER} \
diff --git a/net/gaim/distinfo b/net/gaim/distinfo
index 35b9177540c1..33ea5e99c74d 100644
--- a/net/gaim/distinfo
+++ b/net/gaim/distinfo
@@ -1,2 +1,2 @@
-MD5 (gaim-0.75.tar.bz2) = 9935155985c25dfc9b59183de0da3c30
-SIZE (gaim-0.75.tar.bz2) = 3370977
+MD5 (gaim-0.76.tar.bz2) = 832126135930b4a13537d1270088c2dc
+SIZE (gaim-0.76.tar.bz2) = 3543882
diff --git a/net/gaim/files/patch-plugins_Makefile.in b/net/gaim/files/patch-plugins_Makefile.in
new file mode 100644
index 000000000000..3208c993c071
--- /dev/null
+++ b/net/gaim/files/patch-plugins_Makefile.in
@@ -0,0 +1,14 @@
+--- plugins/Makefile.in.orig	Sat Apr  3 02:52:47 2004
++++ plugins/Makefile.in	Sat Apr  3 02:53:02 2004
+@@ -160,9 +160,9 @@
+ install_sh = @install_sh@
+ perlpath = @perlpath@
+ sedpath = @sedpath@
+-DIST_SUBDIRS = docklet gevolution gaim-remote gestures perl ssl tcl ticker
++DIST_SUBDIRS = docklet gaim-remote gestures perl ssl tcl ticker
+ 
+-@BUILD_GEVOLUTION_TRUE@GEVOLUTION_DIR = gevolution
++@BUILD_GEVOLUTION_TRUE@GEVOLUTION_DIR =
+ 
+ @USE_PERL_TRUE@PERL_DIR = perl
+ 
diff --git a/net/gaim/files/patch-src::gtkconv.c b/net/gaim/files/patch-src::gtkconv.c
deleted file mode 100644
index ab1c804d46e1..000000000000
--- a/net/gaim/files/patch-src::gtkconv.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/gtkconv.c.orig	Thu Aug 14 07:40:41 2003
-+++ src/gtkconv.c	Mon Aug 25 16:34:55 2003
-@@ -1138,11 +1138,27 @@
- 	GaimConversation *conv;
- 	GaimGtkConversation *gtkconv;
- 	GaimGtkWindow *gtkwin;
-+	gboolean im_context_retval = FALSE;
-+	static guint32 last_event_time;
- 
- 	conv    = (GaimConversation *)data;
- 	gtkconv = GAIM_GTK_CONVERSATION(conv);
- 	win     = gaim_conversation_get_window(conv);
- 	gtkwin  = GAIM_GTK_WINDOW(win);
-+
-+	/*
-+	 * Check if the input method handles this keyevent or we can use it.
-+	 * We need to check the event time, otherwise the gtk xim module gets into an event loop (bug?)
-+	 * Maybe this is not the best solution, but it works.
-+	 */
-+
-+	if (last_event_time != event->time) {
-+		im_context_retval = gtk_im_context_filter_keypress(GTK_TEXT_VIEW(gtkconv->entry)->im_context, event);
-+	}
-+	last_event_time = event->time;
-+	if (im_context_retval == TRUE) {
-+		return TRUE;
-+	}
- 
- 	if (event->keyval == GDK_Page_Up) {
- 		g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event");
diff --git a/net/gaim/files/patch-src::protocols::yahoo::yahoo.c b/net/gaim/files/patch-src::protocols::yahoo::yahoo.c
deleted file mode 100644
index c90cbbac36b8..000000000000
--- a/net/gaim/files/patch-src::protocols::yahoo::yahoo.c
+++ /dev/null
@@ -1,255 +0,0 @@
-*** src/protocols/yahoo/yahoo.c.orig	Fri Jan  9 23:04:09 2004
---- src/protocols/yahoo/yahoo.c	Mon Feb  9 09:01:02 2004
-***************
-*** 20,25 ****
---- 20,26 ----
-   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-   *
-   */
-+ #include <limits.h>
-  #include "internal.h"
-  
-  #include "account.h"
-***************
-*** 131,138 ****
---- 132,147 ----
-  		while (pos + 1 < len) {
-  			if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
-  				break;
-+ 			if (x >= sizeof(key)-1) {
-+ 				x++;
-+ 				pos++;
-+ 				continue;
-+ 
-+ 			}
-  			key[x++] = data[pos++];
-  		}
-+ 		if (x >= sizeof(key)-1)
-+ 			x = 0;
-  		key[x] = 0;
-  		pos += 2;
-  		pair->key = strtol(key, NULL, 10);
-***************
-*** 868,899 ****
-  	}
-  }
-  
-  #define OUT_CHARSET "utf-8"
-  
-  static char *yahoo_decode(const char *text)
-  {
-  	char *converted;
-! 	char *p, *n, *new;
-! 	
-! 	n = new = g_malloc(strlen (text) + 1);
-! 
-! 	for (p = (char *)text; *p; p++, n++) {
-  		if (*p == '\\') {
-! 			sscanf(p + 1, "%3o\n", (int *)n);
-! 			p += 3;
-! 		}
-! 		else
-! 			*n = *p;
-  	}
-- 
-  	*n = '\0';
-- 	
-  	converted = g_convert(new, n - new, OUT_CHARSET, "iso-8859-1", NULL, NULL, NULL);
-  	g_free(new);
-  
-  	return converted;
-  }
-  
-  static void yahoo_process_mail(GaimConnection *gc, struct yahoo_packet *pkt)
-  {
-  	GaimAccount *account = gaim_connection_get_account(gc);
---- 877,942 ----
-  	}
-  }
-  
-+ 
-+ static void octal(const char **p, const char *end, unsigned char *n)
-+ {
-+ 	int i, c;
-+ 
-+ 	for (i = 0, c = 0; i < 3 && *p < end; ++i, ++*p) {
-+ 		c <<= 3;
-+ 		switch (**p) {
-+ 		case '0': break;
-+ 		case '1': c += 1; break;
-+ 		case '2': c += 2; break;
-+ 		case '3': c += 3; break;
-+ 		case '4': c += 4; break;
-+ 		case '5': c += 5; break;
-+ 		case '6': c += 6; break;
-+ 		case '7': c += 7; break;
-+ 		default:
-+ 			  if (i == 0) {
-+ 				  *n = **p;
-+ 				  ++*p;
-+ 				  return;
-+ 			  }
-+ 			  c >>= 3;
-+ 			  goto done;
-+ 		}
-+ 	}
-+ done:
-+ 	*n = (c > UCHAR_MAX) ? '?' : c;
-+ 	return;
-+ }
-+ 
-  #define OUT_CHARSET "utf-8"
-  
-  static char *yahoo_decode(const char *text)
-  {
-  	char *converted;
-! 	unsigned char *n, *new;
-! 	size_t len;
-! 	const char *p, *end;
-! 
-! 	len = strlen (text);
-! 	p = text;
-! 	end = &text[len];
-! 	n = new = g_malloc(len + 1);
-! 	while (p < end) {
-  		if (*p == '\\') {
-! 			++p;
-! 			octal(&p, end, n);
-! 		} else
-! 			*n = *p++;
-! 		++n;
-  	}
-  	*n = '\0';
-  	converted = g_convert(new, n - new, OUT_CHARSET, "iso-8859-1", NULL, NULL, NULL);
-  	g_free(new);
-  
-  	return converted;
-  }
-  
-+ 
-  static void yahoo_process_mail(GaimConnection *gc, struct yahoo_packet *pkt)
-  {
-  	GaimAccount *account = gaim_connection_get_account(gc);
-***************
-*** 1903,1934 ****
-  
-  static void yahoo_web_pending(gpointer data, gint source, GaimInputCondition cond)
-  {
-  	GaimConnection *gc = data;
-  	GaimAccount *account = gaim_connection_get_account(gc);
-  	struct yahoo_data *yd = gc->proto_data;
-! 	char buf[1024], buf2[256], *i = buf, *r = buf2;
-! 	int len, o = 0;
-  
-  	len = read(source, buf, sizeof(buf));
-! 	if (len <= 0  || strncmp(buf, "HTTP/1.0 302", strlen("HTTP/1.0 302"))) {
-  		gaim_connection_error(gc, _("Unable to read"));
-  		return;
-  	}
-! 	
-! 	while ((i = strstr(i, "Set-Cookie: ")) && 0 < 2) {
-! 		i += strlen("Set-Cookie: "); 
-! 		for (;*i != ';'; r++, i++) {
-! 			*r = *i;
-! 		}
-! 		*r=';';
-! 		r++;
-! 		*r=' ';
-! 		r++;
-! 		o++;
-! 	}
-! 	/* Get rid of that "; " */
-! 	*(r-2) = '\0';
-! 	yd->auth = g_strdup(buf2);
-  	gaim_input_remove(gc->inpa);
-  	close(source);
-  	/* Now we have our cookies to login with.  I'll go get the milk. */
---- 1946,1981 ----
-  
-  static void yahoo_web_pending(gpointer data, gint source, GaimInputCondition cond)
-  {
-+ 	static const char setcookie[] = "Set-Cookie: ";
-+ 	char http302[] = "HTTP/1.0 302";
-  	GaimConnection *gc = data;
-  	GaimAccount *account = gaim_connection_get_account(gc);
-  	struct yahoo_data *yd = gc->proto_data;
-! 	char buf[1024], *i = buf;
-! 	int len;
-! 	GString *s;
-  
-  	len = read(source, buf, sizeof(buf));
-! 	if (len <= 0) {
-  		gaim_connection_error(gc, _("Unable to read"));
-  		return;
-  	}
-! 	if (len >= sizeof(http302)-1 &&
-! 	    (memcmp(http302, buf, sizeof(http302)-1) != 0) &&
-! 	    (http302[7] = '1') &&
-! 	    (memcmp(http302, buf, sizeof(http302)-1) != 0)) {
-! 		gaim_connection_error(gc, _("Unable to read"));
-! 		return;
-! 	}
-! 	s = g_string_sized_new(len);
-! 	buf[len] = '\0';
-! 	while ((i = strstr(i, setcookie)) != NULL) {
-! 		i += sizeof(setcookie)-1;
-! 		for (;*i != ';'; i++)
-! 			g_string_append_c(s, *i);
-! 		g_string_append(s, "; ");
-! 	}
-! 	yd->auth = g_string_free(s, FALSE);
-  	gaim_input_remove(gc->inpa);
-  	close(source);
-  	/* Now we have our cookies to login with.  I'll go get the milk. */
-***************
-*** 1937,1943 ****
-  			       yahoo_got_web_connected, gc) != 0) {
-  		gaim_connection_error(gc, _("Connection problem"));
-  		return;
-! 	}	
-  }
-  
-  static void yahoo_got_cookies(gpointer data, gint source, GaimInputCondition cond)
---- 1984,1990 ----
-  			       yahoo_got_web_connected, gc) != 0) {
-  		gaim_connection_error(gc, _("Connection problem"));
-  		return;
-! 	}
-  }
-  
-  static void yahoo_got_cookies(gpointer data, gint source, GaimInputCondition cond)
-***************
-*** 1974,1988 ****
-  	const char *c = buf;
-  	char *d;
-  	char name[64], value[64];
-  	while ((c < (buf + len)) && (c = strstr(c, "<input "))) {
-  		c = strstr(c, "name=\"") + strlen("name=\"");
-! 		for (d = name; *c!='"'; c++, d++) 
-  			*d = *c;
-  		*d = '\0';
-  		d = strstr(c, "value=\"") + strlen("value=\"");
-  		if (strchr(c, '>') < d)
-  			break;
-! 		for (c = d, d = value; *c!='"'; c++, d++)
-  			*d = *c;
-  		*d = '\0';
-  		g_hash_table_insert(hash, g_strdup(name), g_strdup(value));
---- 2021,2037 ----
-  	const char *c = buf;
-  	char *d;
-  	char name[64], value[64];
-+ 	int count = sizeof(name)-1;
-  	while ((c < (buf + len)) && (c = strstr(c, "<input "))) {
-  		c = strstr(c, "name=\"") + strlen("name=\"");
-! 		for (d = name; *c!='"' && count; c++, d++, count--)
-  			*d = *c;
-  		*d = '\0';
-+ 		count = sizeof(value)-1;
-  		d = strstr(c, "value=\"") + strlen("value=\"");
-  		if (strchr(c, '>') < d)
-  			break;
-! 		for (c = d, d = value; *c!='"' && count; c++, d++, count--)
-  			*d = *c;
-  		*d = '\0';
-  		g_hash_table_insert(hash, g_strdup(name), g_strdup(value));
diff --git a/net/gaim/files/patch-src::proxy.c b/net/gaim/files/patch-src::proxy.c
deleted file mode 100644
index 2a8ede90c94e..000000000000
--- a/net/gaim/files/patch-src::proxy.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/proxy.c.orig	Fri Jan  9 23:04:56 2004
-+++ src/proxy.c	Thu Mar 25 12:37:20 2004
-@@ -388,7 +388,11 @@
- 	int rc, err;
- 	GSList *hosts = NULL;
- 	struct sockaddr *addr = NULL;
-+#if HAVE_GETADDRINFO
-+	size_t addrlen;
-+#else
- 	socklen_t addrlen;
-+#endif
- 
- 	gaim_debug(GAIM_DEBUG_INFO, "dns", "Host '%s' resolved\n", req->host);
- 	gaim_input_remove(req->inpa);
-@@ -974,7 +978,7 @@
- 
- 	gaim_input_remove(phb->inpa);
- 
--	while ((nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
-+	while ((pos < sizeof(inputline)-1) && (nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
- 		if (inputline[pos - 1] == '\n')
- 			nlc++;
- 		else if (inputline[pos - 1] != '\r')
diff --git a/net/gaim/files/patch-src::util.c b/net/gaim/files/patch-src::util.c
index 79a71a97de84..7beb3f6c76af 100644
--- a/net/gaim/files/patch-src::util.c
+++ b/net/gaim/files/patch-src::util.c
@@ -1,183 +1,105 @@
-*** src/util.c.orig	Fri Jan  9 22:04:56 2004
---- src/util.c	Thu Jan 22 08:26:14 2004
-***************
-*** 247,270 ****
-  /**************************************************************************
-   * Quoted Printable Functions
-   **************************************************************************/
-! void
-! gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
-  {
-! 	char *p, *n, *new;
-  
-! 	n = new = g_malloc(strlen (str) + 1);
-  
-! 	for (p = (char *)str; *p; p++, n++) {
-  		if (*p == '=') {
-! 			sscanf(p + 1, "%2x\n", (int *)n);
-! 			p += 2;
-! 		}
-! 		else if (*p == '_')
-  			*n = ' ';
-  		else
-  			*n = *p;
-  	}
-- 
-  	*n = '\0';
-  
-  	if (ret_len)
---- 247,317 ----
-  /**************************************************************************
-   * Quoted Printable Functions
-   **************************************************************************/
-! static void hex(const char **p, const char *end, unsigned char *n)
-  {
-! 	int i, c;
-  
-! 	for (i = 0, c = 0; i < 2 && *p < end; ++i, ++*p) {
-! 		c <<= 4;
-! 		switch (**p) {
-! 		case '0': break;
-! 		case '1': c += 1; break;
-! 		case '2': c += 2; break;
-! 		case '3': c += 3; break;
-! 		case '4': c += 4; break;
-! 		case '5': c += 5; break;
-! 		case '6': c += 6; break;
-! 		case '7': c += 7; break;
-! 		case '8': c += 8; break;
-! 		case '9': c += 9; break;
-! 		case 'a': c += 10; break;
-! 		case 'b': c += 11; break;
-! 		case 'c': c += 12; break;
-! 		case 'd': c += 13; break;
-! 		case 'e': c += 14; break;
-! 		case 'f': c += 15; break;
-! 		case 'A': c += 10; break;
-! 		case 'B': c += 11; break;
-! 		case 'C': c += 12; break;
-! 		case 'D': c += 13; break;
-! 		case 'E': c += 14; break;
-! 		case 'F': c += 15; break;
-! 		default:
-! 			  if (i == 0) {
-! 				  *n = **p;
-! 				  ++*p;
-! 				  return;
-! 			  }
-! 			  c >>= 4;
-! 			  goto done;
-! 		}
-! 	}
-! done:
-! 	*n = (c > UCHAR_MAX) ? '?' : c;
-! 	return;
-! }
-  
-! void
-! gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
-! {
-! 	const char *p, *end;
-! 	unsigned char *n, *new;
-! 	size_t len;
-! 
-! 	len = strlen (str);
-! 	n = new = g_malloc(len + 1);
-! 	p = str;
-! 	end = &p[len];
-! 	while (p < end) {
-  		if (*p == '=') {
-! 			++p;
-! 			hex(&p, end, n);
-! 		} else if (*p == '_')
-  			*n = ' ';
-  		else
-  			*n = *p;
-+ 		++n;
-  	}
-  	*n = '\0';
-  
-  	if (ret_len)
-***************
-*** 1962,1968 ****
-  			   char **ret_path)
-  {
-  	char scan_info[255];
-! 	char port_str[5];
-  	int f;
-  	const char *turl;
-  	char host[256], path[256];
---- 2009,2015 ----
-  			   char **ret_path)
-  {
-  	char scan_info[255];
-! 	char port_str[6];
-  	int f;
-  	const char *turl;
-  	char host[256], path[256];
-***************
-*** 1982,1997 ****
-  	}
-  
-  	g_snprintf(scan_info, sizeof(scan_info),
-! 			   "%%[%s]:%%[%s]/%%[%s]", addr_ctrl, port_ctrl, page_ctrl);
-  
-  	f = sscanf(url, scan_info, host, port_str, path);
-  
-  	if (f == 1)
-  	{
-  		g_snprintf(scan_info, sizeof(scan_info),
-! 				   "%%[%s]/%%[%s]",
-  				   addr_ctrl, page_ctrl);
-  		f = sscanf(url, scan_info, host, path);
-  		g_snprintf(port_str, sizeof(port_str), "80");
-  	}
-  
---- 2029,2049 ----
-  	}
-  
-  	g_snprintf(scan_info, sizeof(scan_info),
-! 			   "%%255[%s]:%%5[%s]/%%255[%s]", addr_ctrl, port_ctrl, page_ctrl);
-! 	addr_ctrl[sizeof(addr_ctrl)-1] = '\0';
-! 	port_ctrl[sizeof(port_ctrl)-1] = '\0';
-! 	page_ctrl[sizeof(page_ctrl)-1] = '\0';
-  
-  	f = sscanf(url, scan_info, host, port_str, path);
-  
-  	if (f == 1)
-  	{
-  		g_snprintf(scan_info, sizeof(scan_info),
-! 				   "%%255[%s]/%%255[%s]",
-  				   addr_ctrl, page_ctrl);
-  		f = sscanf(url, scan_info, host, path);
-+ 		addr_ctrl[sizeof(addr_ctrl)-1] = '\0';
-+ 		page_ctrl[sizeof(page_ctrl)-1] = '\0';
-  		g_snprintf(port_str, sizeof(port_str), "80");
-  	}
-  
-***************
-*** 2081,2089 ****
-  static size_t
-  parse_content_len(const char *data, size_t data_len)
-  {
-! 	size_t content_len = 0;
-  
-! 	sscanf(data, "Content-Length: %d", (int *)&content_len);
-  
-  	return content_len;
-  }
---- 2133,2146 ----
-  static size_t
-  parse_content_len(const char *data, size_t data_len)
-  {
-! 	int content_len = 0;
-! 	char *tmp;
-  
-! 	tmp = g_malloc(data_len + 1);
-! 	memcpy(tmp, data, data_len);
-! 	tmp[data_len] = '\0';
-! 	sscanf(tmp, "Content-Length: %d", &content_len);
-! 	g_free(tmp);
-  
-  	return content_len;
-  }
+--- src/util.c.orig	Wed Mar 31 17:56:09 2004
++++ src/util.c	Sat Apr  3 00:18:30 2004
+@@ -247,26 +247,71 @@
+ /**************************************************************************
+  * Quoted Printable Functions
+  **************************************************************************/
++static void hex(const char **p, const char *end, unsigned char *n)
++{
++	int i, c;
++
++	for (i = 0, c = 0; i < 2 && *p < end; ++i, ++*p) {
++		c <<= 4;
++		switch (**p) {
++		case '0': break;
++		case '1': c += 1; break;
++		case '2': c += 2; break;
++		case '3': c += 3; break;
++		case '4': c += 4; break;
++		case '5': c += 5; break;
++		case '6': c += 6; break;
++		case '7': c += 7; break;
++		case '8': c += 8; break;
++		case '9': c += 9; break;
++		case 'a': c += 10; break;
++		case 'b': c += 11; break;
++		case 'c': c += 12; break;
++		case 'd': c += 13; break;
++		case 'e': c += 14; break;
++		case 'f': c += 15; break;
++		case 'A': c += 10; break;
++		case 'B': c += 11; break;
++		case 'C': c += 12; break;
++		case 'D': c += 13; break;
++		case 'E': c += 14; break;
++		case 'F': c += 15; break;
++		default:
++			  if (i == 0) {
++				  *n = **p;
++				  ++*p;
++				  return;
++			  }
++			  c >>= 4;
++			  goto done;
++		}
++	}
++done:
++	*n = (c > UCHAR_MAX) ? '?' : c;
++	return;
++}
++  
+ void
+ gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
+ {
+-	char *n, *new;
+-	const char *end, *p;
+-	int i;
+-
+-	n = new = g_malloc(strlen (str) + 1);
+-	end = str + strlen(str);
++	const char *p, *end;
++	unsigned char *n, *new;
++	size_t len;
++
++	len = strlen (str);
++	n = new = g_malloc(len + 1);
++	p = str;
++	end = &p[len];
+ 
+-	for (p = str; p < end; p++, n++) {
++	while (p < end) {
+ 		if (*p == '=') {
+-			sscanf(p + 1, "%2x\n", &i);
+-			*n = i;
+-			p += 2;
++			++p;
++			hex(&p, end, n);
++		} else {
++			*n = *p == '_' ? ' ' : *p;
++			++p;
+ 		}
+-		else if (*p == '_')
+-			*n = ' ';
+-		else
+-			*n = *p;
++		++n;
+ 	}
+ 
+ 	*n = '\0';
+@@ -2119,9 +2164,14 @@
+ static size_t
+ parse_content_len(const char *data, size_t data_len)
+ {
+-	size_t content_len = 0;
++	int content_len = 0;
++	char *tmp;
+ 
+-	sscanf(data, "Content-Length: %d", (int *)&content_len);
++	tmp = g_malloc(data_len + 1);
++	memcpy(tmp, data, data_len);
++	tmp[data_len] = '\0';
++	sscanf(tmp, "Content-Length: %d", &content_len);
++	g_free(tmp);
+ 
+ 	return content_len;
+ }
diff --git a/net/gaim/files/patch-src_plugin.h b/net/gaim/files/patch-src_plugin.h
deleted file mode 100644
index 520ce2ba991f..000000000000
--- a/net/gaim/files/patch-src_plugin.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/plugin.h.orig	Fri Feb 27 15:18:51 2004
-+++ src/plugin.h	Fri Feb 27 15:19:15 2004
-@@ -117,7 +117,7 @@
- /**
-  * Handles the initialization of modules.
-  */
--#if !defined(GAIM_PLUGINS) || defined(STATIC)
-+#if !defined(GAIM_PLUGINS) || defined(GAIM_STATIC_PRPL)
- # define GAIM_INIT_PLUGIN(pluginname, initfunc, plugininfo) \
- 	gboolean gaim_init_##pluginname##_plugin(void) { \
- 		GaimPlugin *plugin = gaim_plugin_new(TRUE, NULL); \
-@@ -125,7 +125,7 @@
- 		initfunc((plugin)); \
- 		return gaim_plugin_register(plugin); \
- 	}
--#else /* GAIM_PLUGINS  && !STATIC */
-+#else /* GAIM_PLUGINS  && !GAIM_STATIC_PRPL */
- # define GAIM_INIT_PLUGIN(pluginname, initfunc, plugininfo) \
- 	G_MODULE_EXPORT gboolean gaim_init_plugin(GaimPlugin *plugin) { \
- 		plugin->info = &(plugininfo); \
diff --git a/net/gaim/pkg-plist b/net/gaim/pkg-plist
index 32e6e71f302f..455c3eda66b3 100644
--- a/net/gaim/pkg-plist
+++ b/net/gaim/pkg-plist
@@ -55,6 +55,7 @@ share/gnome/pixmaps/gaim/dialogs/gaim_question.png
 share/gnome/pixmaps/gaim/dialogs/gaim_warning.png
 share/gnome/pixmaps/gaim/icons/away.png
 share/gnome/pixmaps/gaim/icons/connect.png
+share/gnome/pixmaps/gaim/icons/info.png
 share/gnome/pixmaps/gaim/icons/msgpend.png
 share/gnome/pixmaps/gaim/icons/msgunread.png
 share/gnome/pixmaps/gaim/icons/offline.png
@@ -255,6 +256,7 @@ share/gnome/pixmaps/gaim/status/default/secure.png
 share/gnome/pixmaps/gaim/status/default/trepia.png
 share/gnome/pixmaps/gaim/status/default/wireless.png
 share/gnome/pixmaps/gaim/status/default/yahoo.png
+share/gnome/pixmaps/gaim/status/default/zephyr.png
 share/gnome/pixmaps/gaim/tb_drag_arrow_down.xpm
 share/gnome/pixmaps/gaim/tb_drag_arrow_left.xpm
 share/gnome/pixmaps/gaim/tb_drag_arrow_right.xpm