# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 967009426 0
# Node ID eec93c5929b905005838b2d32f530177deaee30e
# Parent  5a908dd5cfc4bcc693e44956866a7f209c977ef6
[gaim-migrate @ 757]
minor changes

committer: Tailor Script <tailor@pidgin.im>

diff -r 5a908dd5cfc4 -r eec93c5929b9 src/buddy.c
--- a/src/buddy.c	Wed Aug 23 04:14:47 2000 +0000
+++ b/src/buddy.c	Wed Aug 23 05:43:46 2000 +0000
@@ -53,8 +53,6 @@
 #include "pixmaps/buddychat.xpm"
 #include "pixmaps/im.xpm"
 #include "pixmaps/info.xpm"
-#include "pixmaps/permadd.xpm"
-#include "pixmaps/permdel.xpm"
 #include "pixmaps/away_icon.xpm"
 
 #include "pixmaps/daemon-buddyadd.xpm"
@@ -62,26 +60,23 @@
 #include "pixmaps/daemon-buddychat.xpm"
 #include "pixmaps/daemon-im.xpm"
 #include "pixmaps/daemon-info.xpm"
-#include "pixmaps/daemon-permadd.xpm"
-#include "pixmaps/daemon-permdel.xpm"
 
 #include "pixmaps/add_small.xpm"
 #include "pixmaps/import_small.xpm"
 #include "pixmaps/export_small.xpm"
+#ifdef USE_APPLET
 #include "pixmaps/close_small.xpm"
+#endif
 #include "pixmaps/exit_small.xpm"
 
 static GtkTooltips *tips;
 static GtkWidget *editpane;
 static GtkWidget *buddypane;
 static GtkWidget *imchatbox;
-static GtkWidget *permitpane;
 static GtkWidget *edittree;
 static GtkWidget *imbutton, *infobutton, *chatbutton;
 static GtkWidget *addbutton, *groupbutton, *rembutton;
 
-static int last_lag_us;
-
 extern int ticker_prefs;
 
 GtkWidget *blist = NULL;
@@ -1792,7 +1787,6 @@
         GtkWidget *notebook;
         GtkWidget *label;
         GtkWidget *bbox;
-        GtkWidget *permopt;
         GtkWidget *tbox;
 
 
diff -r 5a908dd5cfc4 -r eec93c5929b9 src/dialogs.c
--- a/src/dialogs.c	Wed Aug 23 04:14:47 2000 +0000
+++ b/src/dialogs.c	Wed Aug 23 05:43:46 2000 +0000
@@ -2405,7 +2405,6 @@
 void show_color_dialog(struct conversation *c, GtkWidget *color)
 {
 	GtkWidget *colorsel;
-	gdouble colors[4];
 
 	if ((int)color == 1) { /* foreground */
 		if (fgcseld) return;
@@ -2701,7 +2700,6 @@
 void do_import(GtkWidget *w, void *dummy)
 {
 	gint show_dialog = (int) dummy;
-        GList *grp, *grp2;
         char *buf = g_malloc(BUF_LONG);
         char *buf2;
         char *first = g_malloc(64);
diff -r 5a908dd5cfc4 -r eec93c5929b9 src/oscar.c
--- a/src/oscar.c	Wed Aug 23 04:14:47 2000 +0000
+++ b/src/oscar.c	Wed Aug 23 05:43:46 2000 +0000
@@ -71,7 +71,6 @@
 }
 
 static int gaim_parse_auth_resp  (struct aim_session_t *, struct command_rx_struct *, ...);
-static int gaim_auth_server_ready(struct aim_session_t *, struct command_rx_struct *, ...);
 static int gaim_parse_login      (struct aim_session_t *, struct command_rx_struct *, ...);
 static int gaim_server_ready     (struct aim_session_t *, struct command_rx_struct *, ...);
 static int gaim_handle_redirect  (struct aim_session_t *, struct command_rx_struct *, ...);
@@ -130,7 +129,7 @@
 					signoff();
 					hide_login_progress(_("Disconnected."));
 					auth_failed();
-				} else if (conn->type = AIM_CONN_TYPE_CHAT) {
+				} else if (conn->type == AIM_CONN_TYPE_CHAT) {
 					/* FIXME: we got disconnected from a chat room, but
 					 * libfaim won't tell us which room */
 					debug_print("connection error for chat...\n");
@@ -196,15 +195,6 @@
 	aim_conn_addhandler(sess, conn, 0x0017, 0x0003, gaim_parse_auth_resp, 0);
 	aim_sendconnack(sess, conn);
 	aim_request_login(sess, conn, username);
-/*
-	aim_conn_addhandler(sess, conn, AIM_CB_FAM_SPECIAL,
-				AIM_CB_SPECIAL_AUTHSUCCESS,
-				gaim_parse_auth_resp, 0);
-	aim_conn_addhandler(sess, conn, AIM_CB_FAM_GEN,
-				AIM_CB_GEN_SERVERREADY,
-				gaim_auth_server_ready, 0);
-	aim_send_login(sess, conn, username, password, &info);
-*/
 
 	inpa = gdk_input_add(conn->fd, GDK_INPUT_READ | GDK_INPUT_EXCEPTION,
 			oscar_callback, conn);
@@ -333,25 +323,6 @@
 	return 1;
 }
 
-gboolean change_password = FALSE;
-char *old_password;
-char *new_password;
-
-int gaim_auth_server_ready(struct aim_session_t *sess,
-			   struct command_rx_struct *command, ...) {
-	debug_print("Authorization server is ready.\n");
-	aim_auth_clientready(sess, command->conn);
-	if (change_password) {
-		debug_print("Changing passwords...\n");
-		aim_auth_changepasswd(sess, command->conn, old_password,
-							   new_password);
-		g_free(old_password);
-		g_free(new_password);
-		change_password = FALSE;
-	}
-	return 1;
-}
-
 int gaim_parse_login(struct aim_session_t *sess,
 		     struct command_rx_struct *command, ...) {
 	struct client_info_s info = {"AOL Instant Messenger (TM), version 2.1.1187/WIN32", 4, 30, 3141, "us", "en", 0x0004, 0x0001, 0x055};
@@ -364,6 +335,7 @@
 
 	aim_send_login(sess, command->conn,
 			current_user->username, current_user->password, &info, key);
+	return 1;
 }
 
 int gaim_server_ready(struct aim_session_t *sess,
diff -r 5a908dd5cfc4 -r eec93c5929b9 src/prefs.c
--- a/src/prefs.c	Wed Aug 23 04:14:47 2000 +0000
+++ b/src/prefs.c	Wed Aug 23 05:43:46 2000 +0000
@@ -711,7 +711,7 @@
 
 static struct chat_page *cp = NULL;
 
-static refresh_list(GtkWidget *w, gpointer *m)
+static void refresh_list(GtkWidget *w, gpointer *m)
 {
         char *text = grab_url("http://www.aol.com/community/chat/allchats.html");
         char *c;
diff -r 5a908dd5cfc4 -r eec93c5929b9 src/server.c
--- a/src/server.c	Wed Aug 23 04:14:47 2000 +0000
+++ b/src/server.c	Wed Aug 23 05:43:46 2000 +0000
@@ -272,10 +272,6 @@
 	}
 }
 
-extern gboolean change_password;
-extern char *old_password;
-extern char *new_password;
-
 void serv_change_passwd(char *orig, char *new) {
 	if (!USE_OSCAR) {
 		char *buf = g_malloc(BUF_LONG); 
@@ -283,11 +279,7 @@
 		sflap_send(buf, strlen(buf), TYPE_DATA);
 		g_free(buf);
 	} else {
-		if (change_password) return;
-		change_password = TRUE;
-		old_password = g_strdup(orig);
-		new_password = g_strdup(new);
-		aim_bos_reqservice(gaim_sess, gaim_conn, AIM_CONN_TYPE_AUTH);
+		/* FIXME */
 	}
 }