# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1028534197 0
# Node ID 8d0fa912ecaf4967f14bc596d0fc6b4d4f5fc93e
# Parent  fb1a0caadb9f1d99417991e743f509c5a8d34c2e
[gaim-migrate @ 3395]
A small patch by Ethan Blanton to fix proxy problems.  We conform!

committer: Tailor Script <tailor@pidgin.im>

diff -r fb1a0caadb9f -r 8d0fa912ecaf pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Mon Aug 05 07:44:11 2002 +0000
+++ b/pixmaps/Makefile.am	Mon Aug 05 07:56:37 2002 +0000
@@ -137,21 +137,21 @@
 
 else
 
-	if GNOMEAPPLET
+if GNOMEAPPLET
 
-		gnomedata    = `@GNOME_CONFIG@ --datadir`
+gnomedata    = `@GNOME_CONFIG@ --datadir`
 
-		gaimdistpmdir = $(gnomedata)/pixmaps/gaim
-		gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
+gaimdistpmdir = $(gnomedata)/pixmaps/gaim
+gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
 
-		gaimpixmapdir = $(gnomedata)/pixmaps
-		gaimpixmap_DATA = gaim.png
-
-	else
+gaimpixmapdir = $(gnomedata)/pixmaps
+gaimpixmap_DATA = gaim.png
 
-		pixmapdir = $(datadir)/pixmaps
-		pixmap_DATA = gaim.png
+else
 
-	endif
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = gaim.png
 
 endif
+
+endif
diff -r fb1a0caadb9f -r 8d0fa912ecaf src/proxy.c
--- a/src/proxy.c	Mon Aug 05 07:44:11 2002 +0000
+++ b/src/proxy.c	Mon Aug 05 07:56:37 2002 +0000
@@ -222,8 +222,8 @@
 	return fd;
 }
 
-#define HTTP_GOODSTRING "HTTP/1.0 200 Connection established"
-#define HTTP_GOODSTRING2 "HTTP/1.1 200 Connection established"
+#define HTTP_GOODSTRING "HTTP/1.0 200"
+#define HTTP_GOODSTRING2 "HTTP/1.1 200"
 
 static void http_canread(gpointer data, gint source, GaimInputCondition cond)
 {
diff -r fb1a0caadb9f -r 8d0fa912ecaf src/ui.h
--- a/src/ui.h	Mon Aug 05 07:44:11 2002 +0000
+++ b/src/ui.h	Mon Aug 05 07:56:37 2002 +0000
@@ -81,6 +81,11 @@
 #define FACE_YELL 15
 #define FACE_TOTAL 16
 
+#define GAIM_PIXMAP_ICON 0
+#define GAIM_PIXMAP_ERROR 1
+#define GAIM_PIXMAP_WARNING 2
+#define GAIM_PIXMAP_
+
 struct debug_window {
 	GtkWidget *window;
 	GtkWidget *entry;