# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1055604303 0
# Node ID d048e5f2af275a997d807fcfabdb84fe972c0598
# Parent  db4df0be06fd7f7004f4ad8ff9463910ad007537
[gaim-migrate @ 6299]
assorted compile cleanups and fixes I came across

committer: Tailor Script <tailor@pidgin.im>

diff -r db4df0be06fd -r d048e5f2af27 src/account.c
--- a/src/account.c	Sat Jun 14 12:01:19 2003 +0000
+++ b/src/account.c	Sat Jun 14 15:25:03 2003 +0000
@@ -36,6 +36,7 @@
 #include "prefs.h"
 #include "prpl.h"
 #include "util.h"
+#include "gaim.h"
 
 typedef enum
 {
diff -r db4df0be06fd -r d048e5f2af27 src/gaimrc.c
--- a/src/gaimrc.c	Sat Jun 14 12:01:19 2003 +0000
+++ b/src/gaimrc.c	Sat Jun 14 15:25:03 2003 +0000
@@ -684,6 +684,8 @@
 		gaim_proxy_info_set_port(info, atoi(p->value[2]));
 		gaim_proxy_info_set_username(info, p->value[3]);
 		gaim_proxy_info_set_password(info, p->value[4]);
+
+		gaim_account_set_proxy_info(account, info);
 	}
 
 	return account;
diff -r db4df0be06fd -r d048e5f2af27 src/gtkprefs.c
--- a/src/gtkprefs.c	Sat Jun 14 12:01:19 2003 +0000
+++ b/src/gtkprefs.c	Sat Jun 14 15:25:03 2003 +0000
@@ -950,7 +950,6 @@
 	GtkWidget *button, *close_checkbox;
 	GtkSizeGroup *sg;
 	GList *names = NULL;
-	int i;
 
 	ret = gtk_vbox_new(FALSE, 18);
 	gtk_container_set_border_width(GTK_CONTAINER(ret), 12);
diff -r db4df0be06fd -r d048e5f2af27 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Sat Jun 14 12:01:19 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Sat Jun 14 15:25:03 2003 +0000
@@ -5461,7 +5461,7 @@
 
 	char *md5 = NULL;
 	fu16_t type;
-	fu8_t length, cached;
+	fu8_t length = 0, cached = 0;
 	va_list ap;
 	va_start(ap, fr);
 	type = va_arg(ap, int);
diff -r db4df0be06fd -r d048e5f2af27 src/protocols/trepia/trepia.c
--- a/src/protocols/trepia/trepia.c	Sat Jun 14 12:01:19 2003 +0000
+++ b/src/protocols/trepia/trepia.c	Sat Jun 14 15:25:03 2003 +0000
@@ -142,20 +142,6 @@
 }
 
 static void
-_remove_user_fnc(gpointer key, gpointer value, gpointer user_data)
-{
-	TrepiaSession *session;
-	TrepiaProfile *profile;
-	const char *name;
-
-	name    = (const char *)key;
-	profile = (TrepiaProfile *)value;
-	session = (TrepiaSession *)user_data;
-
-	gaim_blist_remove_buddy(profile->buddy);
-}
-
-static void
 __clear_user_list(TrepiaSession *session)
 {
 	GaimBlistNode *gnode, *bnode;