# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1059432794 0
# Node ID ef9065e525826542f499e784f91cc66ddc8b79f0
# Parent  2c9b9d51bec296ea798c069cb1f792a30829f225
[gaim-migrate @ 6819]
Hiptop is a funny word.
Also, this should fix some crashination when using an http proxy with a
username but no password on Solaris.  Needless to say, it's a bit rare.

committer: Tailor Script <tailor@pidgin.im>

diff -r 2c9b9d51bec2 -r ef9065e52582 ChangeLog
--- a/ChangeLog	Mon Jul 28 02:58:15 2003 +0000
+++ b/ChangeLog	Mon Jul 28 22:53:14 2003 +0000
@@ -5,9 +5,12 @@
 	  You'll need to reconfigure your settings for this plugin
 	* Various bug fixes (larne from irc, Tim Ringenbach, Bjoern 
 	  Voigt, Paul A (darkrain))
+	* Shows "hiptop" icon for AIM buddies using hiptop
+	  devices (Robey Pointer)
 	* British English "translation" updated (Sam Halliday)
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Danish translation updated (Morten Brix Pedersen)
 	* Dutch translation updated (Vincent van Adrighem)
 	* German translation updated (Bjoern Voigt)
 	* Hungarian translation updated (Zoltan Sutto)
@@ -16,7 +19,6 @@
 	  Neto)
 	* Serbian translation updated (Danilo Segan)
 	* Spanish translation updated (Javier Fernandez-Sanguino Pena)
-	* Danish translation updated (Morten Brix Pedersen)
 
 version 0.66 (07/18/2003):
 	* Freebsd compile fix (Matthew Luckie)
diff -r 2c9b9d51bec2 -r ef9065e52582 pixmaps/status/default/Makefile.am
--- a/pixmaps/status/default/Makefile.am	Mon Jul 28 02:58:15 2003 +0000
+++ b/pixmaps/status/default/Makefile.am	Mon Jul 28 22:53:14 2003 +0000
@@ -1,8 +1,32 @@
-EXTRA_DIST = activebuddy.png admin.png aim.png aol.png away.png dnd.png \
-			 extendedaway.png female.png freeforchat.png gadu-gadu.png \
-			 game.png icq.png invisible.png irc.png jabber.png login.png \
-			 logout.png male.png msn.png na.png napster.png notauthorized.png \
-			 occupied.png offline.png trepia.png wireless.png yahoo.png
+EXTRA_DIST = \
+	activebuddy.png \
+	admin.png \
+	aim.png \
+	aol.png \
+	away.png \
+	dnd.png \
+	extendedaway.png \
+	female.png \
+	freeforchat.png \
+	gadu-gadu.png \
+	game.png \
+	hiptop.png \
+	icq.png \
+	invisible.png \
+	irc.png \
+	jabber.png \
+	login.png \
+	logout.png \
+	male.png \
+	msn.png \
+	na.png \
+	napster.png \
+	notauthorized.png \
+	occupied.png \
+	offline.png \
+	trepia.png \
+	wireless.png \
+	yahoo.png
 
 gaimstatuspixdir = $(datadir)/pixmaps/gaim/status/default
 
diff -r 2c9b9d51bec2 -r ef9065e52582 src/proxy.c
--- a/src/proxy.c	Mon Jul 28 02:58:15 2003 +0000
+++ b/src/proxy.c	Mon Jul 28 22:53:14 2003 +0000
@@ -937,8 +937,8 @@
 		char *t1, *t2;
 		t1 = g_strdup_printf("%s:%s",
 							 gaim_proxy_info_get_username(phb->gpi),
-							 gaim_proxy_info_get_password(phb->gpi));
-
+							 gaim_proxy_info_get_password(phb->gpi) ? 
+							 gaim_proxy_info_get_password(phb->gpi) : "");
 		t2 = tobase64(t1, strlen(t1));
 		g_free(t1);
 		g_return_if_fail(request_len < sizeof(request));