# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 974075822 0
# Node ID 18a14e6dd0af98d13d4afc11e60be0e7ba00e0ca
# Parent  56c7ceb986a8b49509af46810e7178a0d36c43c7
[gaim-migrate @ 1098]
more fixes for proxy stuff

committer: Tailor Script <tailor@pidgin.im>

diff -r 56c7ceb986a8 -r 18a14e6dd0af src/aim.c
--- a/src/aim.c	Sun Nov 12 23:54:07 2000 +0000
+++ b/src/aim.c	Mon Nov 13 00:37:02 2000 +0000
@@ -70,10 +70,6 @@
 
 void BuddyTickerCreateWindow( void );
 
-char toc_addy[16];
-char *quad_addr = NULL;
-
-
 void cancel_logon(void)
 {
 #ifdef USE_APPLET
diff -r 56c7ceb986a8 -r 18a14e6dd0af src/buddy.c
--- a/src/buddy.c	Sun Nov 12 23:54:07 2000 +0000
+++ b/src/buddy.c	Mon Nov 13 00:37:02 2000 +0000
@@ -847,6 +847,7 @@
 {
 	struct buddy *b;
 	struct group *g;
+	struct group_show *gs = find_group_show(group);
 
 	if ((b = find_buddy(gc, buddy)) != NULL)
                 return b;
@@ -870,6 +871,8 @@
 
         b->idle = 0;
 	b->caps = 0;
+
+	if (gs) update_num_group(gs);
 			
 	return b;
 }
@@ -889,6 +892,8 @@
 
 	g->members = NULL;
 	
+	if (!blist) return;
+
 	build_edit_tree();
 	
 	if (!(display_options & OPT_DISP_NO_MT_GRP) && !find_group_show(group))
@@ -1725,6 +1730,8 @@
 				gtk_timeout_remove(bs->log_timer);
 			if (!g_slist_find(bs->connlist, gc))
 				bs->connlist = g_slist_append(bs->connlist, gc);
+			else
+				debug_printf("already got signon for %s from %s\n", b->name, gc->username);
 			update_num_group(gs);
 			bs->log_timer = gtk_timeout_add(10000, (GtkFunction)log_timeout, bs);
 			if (display_options & OPT_DISP_SHOW_LOGON) {
diff -r 56c7ceb986a8 -r 18a14e6dd0af src/gaim.h
--- a/src/gaim.h	Sun Nov 12 23:54:07 2000 +0000
+++ b/src/gaim.h	Mon Nov 13 00:37:02 2000 +0000
@@ -477,8 +477,6 @@
 extern GList *conversations;
 extern GList *chat_rooms;
 extern GtkWidget *mainwindow;
-extern char *quad_addr;
-extern char toc_addy[16];
 
 /* Globals in away.c */
 extern struct away_message *awaymessage;
@@ -572,8 +570,6 @@
 extern GList *aim_users;
 extern char web_command[2048];
 extern char debug_buff[BUF_LONG];
-extern char aim_host[512];
-extern int aim_port;
 extern struct save_pos blist_pos;
 extern char latest_ver[25];
 
@@ -595,7 +591,6 @@
 extern void update_idle_times();
 
 /* Functions in html.c */
-extern char *fix_url(char *);
 extern struct g_url parse_url(char *);
 extern char *grab_url(struct aim_user *, char *);
 extern gchar *strip_html(gchar *);
diff -r 56c7ceb986a8 -r 18a14e6dd0af src/gaimrc.c
--- a/src/gaimrc.c	Sun Nov 12 23:54:07 2000 +0000
+++ b/src/gaimrc.c	Mon Nov 13 00:37:02 2000 +0000
@@ -46,8 +46,6 @@
 int report_idle, web_browser;
 struct save_pos blist_pos;
 char web_command[2048];
-char aim_host[512];
-int aim_port;
 char latest_ver[25];
 char *sound_file[NUM_SOUNDS];
 
diff -r 56c7ceb986a8 -r 18a14e6dd0af src/html.c
--- a/src/html.c	Sun Nov 12 23:54:07 2000 +0000
+++ b/src/html.c	Mon Nov 13 00:37:02 2000 +0000
@@ -210,21 +210,3 @@
 	close(sock);
 	return webdata;
 }
-
-char *fix_url(gchar *buf)
-{
-	char *new,*tmp;
-	int size;
-
-	size=8;
-	size+=strlen(quad_addr);
-	tmp=strchr(strchr(buf,':')+1,':');
-	size+=strlen(tmp);
-	new=g_malloc(size);
-	strcpy(new,"http://");
-	strcat(new,quad_addr);
-	strcat(new,tmp);
-	return(new);
-}
-
-
diff -r 56c7ceb986a8 -r 18a14e6dd0af src/toc.c
--- a/src/toc.c	Sun Nov 12 23:54:07 2000 +0000
+++ b/src/toc.c	Mon Nov 13 00:37:02 2000 +0000
@@ -47,7 +47,7 @@
 #include "pixmaps/dt_icon.xpm"
 #include "pixmaps/free_icon.xpm"
 
-#define REVISION "gaim:$Revision: 1097 $"
+#define REVISION "gaim:$Revision: 1098 $"
 
 struct toc_data {
 	int toc_fd;
@@ -84,7 +84,8 @@
 	gc = new_gaim_conn(PROTO_TOC, user->username, user->password);
 	gc->proto_data = tdt = g_new0(struct toc_data, 1);
 	
-	g_snprintf(buf, sizeof(buf), "Looking up %s", aim_host);	
+	g_snprintf(buf, sizeof(buf), "Looking up %s", 
+		user->proto_opt[USEROPT_AUTH][0] ? user->proto_opt[USEROPT_AUTH] : TOC_HOST);
 	set_login_progress(gc, 1, buf);
 	while (gtk_events_pending())
 		gtk_main_iteration();
@@ -452,7 +453,7 @@
 		url = strtok(NULL, ":");
 
 
-		g_snprintf(tmp, sizeof(tmp), "http://%s:%d/%s", toc_addy, aim_port, url);
+		g_snprintf(tmp, sizeof(tmp), "http://%s:%d/%s", TOC_HOST, TOC_PORT, url);
 		g_show_info(gc->user, tmp);
         } else if (!strcasecmp(c, "EVILED")) {
                 int lev;