# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 976751986 0
# Node ID 8342d3aab1f1112722ca178d11ea9e141d5fa764
# Parent  46c09828e929270bc7534f76e65dab13bb9d2258
[gaim-migrate @ 1263]
only need buddy.c (which should be mostly painless) and dialogs.c (which should kill me)

committer: Tailor Script <tailor@pidgin.im>

diff -r 46c09828e929 -r 8342d3aab1f1 libfaim/aim_login.c
--- a/libfaim/aim_login.c	Wed Dec 13 22:12:02 2000 +0000
+++ b/libfaim/aim_login.c	Wed Dec 13 23:59:46 2000 +0000
@@ -199,7 +199,7 @@
   
     curbyte += aim_puttlv_32(newpacket->data+curbyte, 0x0014, clientinfo->unknown);
     curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0009, 0x0015);
-    //curbyte += aim_puttlv_8(newpacket->data+curbyte, 0x004a, 0x01);
+    curbyte += aim_puttlv_8(newpacket->data+curbyte, 0x004a, 0x00);
   } else {
     /* Use very specific version numbers, to further indicate the hack. */
     curbyte += aim_puttlv_16(newpacket->data+curbyte, 0x0016, 0x010a);
diff -r 46c09828e929 -r 8342d3aab1f1 src/conversation.c
--- a/src/conversation.c	Wed Dec 13 22:12:02 2000 +0000
+++ b/src/conversation.c	Wed Dec 13 23:59:46 2000 +0000
@@ -71,7 +71,7 @@
 #include "pixmaps/luke03.xpm"
 #include "pixmaps/oneeye.xpm"
 
-int state_lock=0;
+int state_lock = 0;
 
 GdkPixmap *dark_icon_pm = NULL;
 GdkBitmap *dark_icon_bm = NULL;
@@ -81,7 +81,7 @@
 extern GdkColor fgcolor;
 
 void check_everything(GtkWidget *entry);
-gboolean keypress_callback(GtkWidget *entry, GdkEventKey *event,  struct conversation *c);
+gboolean keypress_callback(GtkWidget *entry, GdkEventKey * event, struct conversation *c);
 
 /*------------------------------------------------------------------------*/
 /*  Helpers                                                               */
@@ -90,40 +90,40 @@
 
 void quiet_set(GtkWidget *tb, int state)
 {
-	state_lock=1;
+	state_lock = 1;
 	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(tb), state);
-	state_lock=0;
+	state_lock = 0;
 }
 
 
 void set_state_lock(int i)
 {
-        state_lock = i;
+	state_lock = i;
 }
 
 void toggle_sensitive(GtkWidget *widget, GtkWidget *to_toggle)
 {
 	gboolean sensitivity = GTK_WIDGET_IS_SENSITIVE(GTK_WIDGET(to_toggle));
-	
+
 	if (sensitivity == TRUE)
 		gtk_widget_set_sensitive(GTK_WIDGET(to_toggle), FALSE);
 	else
 		gtk_widget_set_sensitive(GTK_WIDGET(to_toggle), TRUE);
-		
+
 	return;
 }
 
 struct conversation *new_conversation(char *name)
 {
-        struct conversation *c;
+	struct conversation *c;
+
+	c = find_conversation(name);
 
-        c = find_conversation(name);
-	
-        if (c != NULL)
-                return c;
+	if (c != NULL)
+		return c;
 
-        c = (struct conversation *)g_new0(struct conversation, 1);
-        g_snprintf(c->name, sizeof(c->name), "%s", name);
+	c = (struct conversation *)g_new0(struct conversation, 1);
+	g_snprintf(c->name, sizeof(c->name), "%s", name);
 
 	if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) {
 		FILE *fd;
@@ -131,9 +131,11 @@
 		fd = open_log_file(c->name);
 		if (fd > 0) {
 			if (!(general_options & OPT_GEN_STRIP_HTML))
-				fprintf(fd, "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n", full_date()); 
+				fprintf(fd,
+					"<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n",
+					full_date());
 			else
-				fprintf(fd, " ---- New Conversation @ %s ----\n", full_date()); 
+				fprintf(fd, " ---- New Conversation @ %s ----\n", full_date());
 			fclose(fd);
 		} else
 			/* do we want to do something here? */ ;
@@ -141,31 +143,31 @@
 
 	if (connections)
 		c->gc = (struct gaim_connection *)connections->data;
-        show_conv(c);
-        conversations = g_list_append(conversations, c);
+	show_conv(c);
+	conversations = g_list_append(conversations, c);
 	plugin_event(event_new_conversation, name, 0, 0, 0);
-        return c;
+	return c;
 }
 
 
 struct conversation *find_conversation(char *name)
 {
-        char *cuser = g_malloc(64);
-        struct conversation *c;
-        GList *cnv = conversations;
-        
-        strcpy(cuser, normalize(name));
+	char *cuser = g_malloc(64);
+	struct conversation *c;
+	GList *cnv = conversations;
+
+	strcpy(cuser, normalize(name));
 
-        while(cnv) {
-                c = (struct conversation *)cnv->data;
-                if(!strcasecmp(cuser, normalize(c->name))) {
-                        g_free(cuser);
-                        return c;
-                }
-                cnv = cnv->next;
-        }
-        g_free(cuser);
-        return NULL;
+	while (cnv) {
+		c = (struct conversation *)cnv->data;
+		if (!strcasecmp(cuser, normalize(c->name))) {
+			g_free(cuser);
+			return c;
+		}
+		cnv = cnv->next;
+	}
+	g_free(cuser);
+	return NULL;
 }
 
 /* ---------------------------------------------------
@@ -175,33 +177,33 @@
 
 void rm_log(struct log_conversation *a)
 {
-        struct conversation *cnv = find_conversation(a->name);
-        char buf[128];
+	struct conversation *cnv = find_conversation(a->name);
+	char buf[128];
+
+	log_conversations = g_list_remove(log_conversations, a);
 
-        log_conversations = g_list_remove(log_conversations, a);
-        
-        save_prefs();
+	save_prefs();
 
-        if (cnv) {
+	if (cnv) {
 		if (!(general_options & OPT_GEN_LOG_ALL))
-                	g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, cnv->name);
+			g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, cnv->name);
 		else
 			g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, cnv->name);
-                gtk_window_set_title(GTK_WINDOW(cnv->window), buf);
-        }
+		gtk_window_set_title(GTK_WINDOW(cnv->window), buf);
+	}
 }
 
 struct log_conversation *find_log_info(char *name)
 {
-        char *pname = g_malloc(64);
-        GList *lc = log_conversations;
+	char *pname = g_malloc(64);
+	GList *lc = log_conversations;
 	struct log_conversation *l;
-		
+
 
 	strcpy(pname, normalize(name));
 
-        while(lc) {
-                l = (struct log_conversation *)lc->data;
+	while (lc) {
+		l = (struct log_conversation *)lc->data;
 		if (!strcasecmp(pname, normalize(l->name))) {
 			g_free(pname);
 			return l;
@@ -214,7 +216,7 @@
 
 void delete_conversation(struct conversation *c)
 {
-        conversations = g_list_remove(conversations, c);
+	conversations = g_list_remove(conversations, c);
 	if (c->fg_color_dialog)
 		gtk_widget_destroy(c->fg_color_dialog);
 	if (c->bg_color_dialog)
@@ -238,11 +240,12 @@
 	GList *cnv = conversations;
 	struct conversation *c;
 
-	while(cnv) {
+	while (cnv) {
 		c = (struct conversation *)cnv->data;
 
 		if (c->log_button)
-			gtk_widget_set_sensitive(c->log_button, ((general_options & OPT_GEN_LOG_ALL)) ? FALSE : TRUE);
+			gtk_widget_set_sensitive(c->log_button,
+						 ((general_options & OPT_GEN_LOG_ALL)) ? FALSE : TRUE);
 
 		cnv = cnv->next;
 	}
@@ -250,11 +253,13 @@
 	while (C) {
 		g = (struct gaim_connection *)C->data;
 		bcs = g->buddy_chats;
-		while(bcs) {
+		while (bcs) {
 			c = (struct conversation *)bcs->data;
 
 			if (c->log_button)
-				gtk_widget_set_sensitive(c->log_button, ((general_options & OPT_GEN_LOG_ALL)) ? FALSE : TRUE);
+				gtk_widget_set_sensitive(c->log_button,
+							 ((general_options & OPT_GEN_LOG_ALL)) ? FALSE :
+							 TRUE);
 
 			bcs = bcs->next;
 		}
@@ -271,16 +276,20 @@
 		c = (struct conversation *)cnv->data;
 
 		if (c->bold)
-			gtk_widget_set_sensitive(c->bold, ((font_options & OPT_FONT_BOLD)) ? FALSE : TRUE);
+			gtk_widget_set_sensitive(c->bold,
+						 ((font_options & OPT_FONT_BOLD)) ? FALSE : TRUE);
 
-                if (c->italic)
-                        gtk_widget_set_sensitive(c->italic, ((font_options & OPT_FONT_ITALIC)) ? FALSE : TRUE);
+		if (c->italic)
+			gtk_widget_set_sensitive(c->italic,
+						 ((font_options & OPT_FONT_ITALIC)) ? FALSE : TRUE);
 
-                if (c->underline)
-                        gtk_widget_set_sensitive(c->underline, ((font_options & OPT_FONT_UNDERLINE)) ? FALSE : TRUE);
+		if (c->underline)
+			gtk_widget_set_sensitive(c->underline,
+						 ((font_options & OPT_FONT_UNDERLINE)) ? FALSE : TRUE);
 
-                if (c->strike)
-                        gtk_widget_set_sensitive(c->strike, ((font_options & OPT_FONT_STRIKE)) ? FALSE : TRUE);
+		if (c->strike)
+			gtk_widget_set_sensitive(c->strike,
+						 ((font_options & OPT_FONT_STRIKE)) ? FALSE : TRUE);
 
 		cnv = cnv->next;
 	}
@@ -313,14 +322,14 @@
 
 void toggle_loggle(GtkWidget *loggle, struct conversation *c)
 {
-        if (state_lock)
-                return;
-        if (find_log_info(c->name))
-                rm_log(find_log_info(c->name));
-        else if (GTK_TOGGLE_BUTTON(loggle)->active)
-			show_log_dialog(c);
-		else
-			cancel_log(NULL, c);
+	if (state_lock)
+		return;
+	if (find_log_info(c->name))
+		 rm_log(find_log_info(c->name));
+	else if (GTK_TOGGLE_BUTTON(loggle)->active)
+		show_log_dialog(c);
+	else
+		cancel_log(NULL, c);
 }
 
 void insert_smiley(GtkWidget *smiley, struct conversation *c)
@@ -331,7 +340,7 @@
 		show_smiley_dialog(c, smiley);
 	else if (c->smiley_dialog)
 		close_smiley_dialog(smiley, c);
-	
+
 	return;
 }
 
@@ -351,7 +360,7 @@
 		gtkspell_detach(GTK_TEXT(c->entry));
 
 	if (c->window)
-	        gtk_widget_destroy(c->window);
+		gtk_widget_destroy(c->window);
 	c->window = NULL;
 
 	if (c->fg_color_dialog)
@@ -386,10 +395,10 @@
 			g_free(c);
 		}
 	} else {
-	        delete_conversation(c);
+		delete_conversation(c);
 	}
 
-        return TRUE;
+	return TRUE;
 }
 
 void set_font_face(char *newfont, struct conversation *c)
@@ -398,9 +407,8 @@
 	int alloc = 1;
 
 	pre_fontface = g_strconcat("<FONT FACE=\"", newfont, "\">", '\0');
-	
-	if (!strcmp(pre_fontface, "<FONT FACE=\"\">"))
-	{
+
+	if (!strcmp(pre_fontface, "<FONT FACE=\"\">")) {
 		g_free(pre_fontface);
 		alloc--;
 		pre_fontface = "<FONT FACE=\"Helvetica\">";
@@ -410,12 +418,12 @@
 	c->hasfont = 1;
 	surround(c->entry, pre_fontface, "</FONT>");
 	gtk_widget_grab_focus(c->entry);
-	
+
 	if (alloc)
 		g_free(pre_fontface);
 }
 
-static gint delete_event_convo(GtkWidget *w, GdkEventAny *e, struct conversation *c)
+static gint delete_event_convo(GtkWidget *w, GdkEventAny * e, struct conversation *c)
 {
 	delete_conversation(c);
 	return FALSE;
@@ -428,10 +436,9 @@
 		remove_buddy(c->gc, find_group_by_buddy(c->gc, c->name), find_buddy(c->gc, c->name));
 		build_edit_tree();
 		update_convo_add_button(c);
-	}
-	else
-	{
-        	if (c->gc) show_add_buddy(c->gc, c->name, NULL);
+	} else {
+		if (c->gc)
+			show_add_buddy(c->gc, c->name, NULL);
 	}
 
 	gtk_widget_grab_focus(c->entry);
@@ -440,69 +447,75 @@
 
 void block_callback(GtkWidget *widget, struct conversation *c)
 {
-        if (c->gc) show_add_perm(c->gc, c->name, FALSE);
+	if (c->gc)
+		show_add_perm(c->gc, c->name, FALSE);
 	gtk_widget_grab_focus(c->entry);
 }
 
 void warn_callback(GtkWidget *widget, struct conversation *c)
 {
-        show_warn_dialog(c->gc, c->name);
+	show_warn_dialog(c->gc, c->name);
 	gtk_widget_grab_focus(c->entry);
 }
 
 void info_callback(GtkWidget *w, struct conversation *c)
 {
 	if (c->is_chat) {
-	        char *name;
-	        GList *i;
+		char *name;
+		GList *i;
 
-	        i = GTK_LIST(c->list)->selection;
-	        if (i)
-	                name = (char *)gtk_object_get_user_data(GTK_OBJECT(i->data));
-	        else
-	                return;
+		i = GTK_LIST(c->list)->selection;
+		if (i)
+			name = (char *)gtk_object_get_user_data(GTK_OBJECT(i->data));
+		else
+			return;
 
-	        serv_get_info(c->gc, name);
+		serv_get_info(c->gc, name);
 	} else {
-	        serv_get_info(c->gc, c->name);
+		serv_get_info(c->gc, c->name);
 		gtk_widget_grab_focus(c->entry);
 	}
 }
 
-gboolean keypress_callback(GtkWidget *entry, GdkEventKey *event,  struct conversation *c)
+gboolean keypress_callback(GtkWidget *entry, GdkEventKey * event, struct conversation *c)
 {
 	int pos;
-	if(event->keyval==GDK_Return) {
-		if(!(event->state & GDK_SHIFT_MASK)
-		   && (general_options & OPT_GEN_ENTER_SENDS)) {
+	if (event->keyval == GDK_Return) {
+		if (!(event->state & GDK_SHIFT_MASK)
+		    && (general_options & OPT_GEN_ENTER_SENDS)) {
 			gtk_signal_emit_by_name(GTK_OBJECT(entry), "activate", c);
 			//to stop the putting in of the enter character
 			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 		} else {
 			gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
-			pos=gtk_editable_get_position(GTK_EDITABLE(entry));
+			pos = gtk_editable_get_position(GTK_EDITABLE(entry));
 			gtk_editable_insert_text(GTK_EDITABLE(entry), "\n", 1, &pos);
 		}
 	} else if (event->state & GDK_CONTROL_MASK) {
 		if (general_options & OPT_GEN_CTL_CHARS) {
 			switch (event->keyval) {
 			case 'i':
-				quiet_set(c->italic, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->italic)));
+				quiet_set(c->italic,
+					  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->italic)));
 				do_italic(c->italic, c->entry);
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 				break;
-			case 'u': /* ctl-u is GDK_Clear, which clears the line */
-				quiet_set(c->underline, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->underline)));
+			case 'u':	/* ctl-u is GDK_Clear, which clears the line */
+				quiet_set(c->underline,
+					  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
+									(c->underline)));
 				do_underline(c->underline, c->entry);
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 				break;
-			case 'b': /* ctl-b is GDK_Left, which moves backwards */
-				quiet_set(c->bold, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->bold)));
+			case 'b':	/* ctl-b is GDK_Left, which moves backwards */
+				quiet_set(c->bold,
+					  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->bold)));
 				do_bold(c->bold, c->entry);
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 				break;
 			case 's':
-				quiet_set(c->strike, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->strike)));
+				quiet_set(c->strike,
+					  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->strike)));
 				do_strike(c->strike, c->entry);
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 				break;
@@ -512,54 +525,54 @@
 			char buf[7];
 			buf[0] = '\0';
 			switch (event->keyval) {
-				case '1':
-					sprintf(buf, ":-)");
-					break;
-				case '2':
-					sprintf(buf, ":-(");
-					break;
-				case '3':
-					sprintf(buf, ";-)");
-					break;
-				case '4':
-					sprintf(buf, ":-P");
-					break;
-				case '5':
-					sprintf(buf, "=-O");
-					break;
-				case '6':
-					sprintf(buf, ":-*");
-					break;
-				case '7':
-					sprintf(buf, ">:o");
-					break;
-				case '8':
-					sprintf(buf, "8-)");
-					break;
-				case '!':
-					sprintf(buf, ":-$");
-					break;
-				case '@':
-					sprintf(buf, ":-!");
-					break;
-				case '#':
-					sprintf(buf, ":-[");
-					break;
-				case '$':
-					sprintf(buf, "O:-)");
-					break;
-				case '%':
-					sprintf(buf, ":-/");
-					break;
-				case '^':
-					sprintf(buf, ":'(");
-					break;
-				case '&':
-					sprintf(buf, ":-X");
-					break;
-				case '*':
-					sprintf(buf, ":-D");
-					break;
+			case '1':
+				sprintf(buf, ":-)");
+				break;
+			case '2':
+				sprintf(buf, ":-(");
+				break;
+			case '3':
+				sprintf(buf, ";-)");
+				break;
+			case '4':
+				sprintf(buf, ":-P");
+				break;
+			case '5':
+				sprintf(buf, "=-O");
+				break;
+			case '6':
+				sprintf(buf, ":-*");
+				break;
+			case '7':
+				sprintf(buf, ">:o");
+				break;
+			case '8':
+				sprintf(buf, "8-)");
+				break;
+			case '!':
+				sprintf(buf, ":-$");
+				break;
+			case '@':
+				sprintf(buf, ":-!");
+				break;
+			case '#':
+				sprintf(buf, ":-[");
+				break;
+			case '$':
+				sprintf(buf, "O:-)");
+				break;
+			case '%':
+				sprintf(buf, ":-/");
+				break;
+			case '^':
+				sprintf(buf, ":'(");
+				break;
+			case '&':
+				sprintf(buf, ":-X");
+				break;
+			case '*':
+				sprintf(buf, ":-D");
+				break;
 			}
 			if (buf[0]) {
 				if (GTK_EDITABLE(c->entry)->has_selection) {
@@ -586,14 +599,15 @@
 	char *buf, *buf2, *buf3;
 	int limit;
 
-	if (!c->gc) return;
+	if (!c->gc)
+		return;
 
 	buf2 = gtk_editable_get_chars(GTK_EDITABLE(c->entry), 0, -1);
 	/* uncomment this if you want no limit on outgoing messages.
 	 * if you uncomment this, you'll probably get kicked off if
 	 * you send one that's too big.
-	limit = strlen(buf2) * 2;
-	*/
+	 limit = strlen(buf2) * 2;
+	 */
 	limit = 7985 << 2;
 	buf = g_malloc(limit);
 	g_snprintf(buf, limit, "%s", buf2);
@@ -609,38 +623,40 @@
 
 	buf2 = g_malloc(limit);
 
-        if (font_options & OPT_FONT_BOLD) {
-                g_snprintf(buf2, limit, "<B>%s</B>", buf);
-                strcpy(buf, buf2);
-        }
+	if (font_options & OPT_FONT_BOLD) {
+		g_snprintf(buf2, limit, "<B>%s</B>", buf);
+		strcpy(buf, buf2);
+	}
 
-        if (font_options & OPT_FONT_ITALIC) {
-                g_snprintf(buf2, limit, "<I>%s</I>", buf);
-                strcpy(buf, buf2);
-        }
+	if (font_options & OPT_FONT_ITALIC) {
+		g_snprintf(buf2, limit, "<I>%s</I>", buf);
+		strcpy(buf, buf2);
+	}
 
-        if (font_options & OPT_FONT_UNDERLINE) {
-                g_snprintf(buf2, limit, "<U>%s</U>", buf);
-                strcpy(buf, buf2);
-        }
+	if (font_options & OPT_FONT_UNDERLINE) {
+		g_snprintf(buf2, limit, "<U>%s</U>", buf);
+		strcpy(buf, buf2);
+	}
 
-        if (font_options & OPT_FONT_STRIKE) {
-                g_snprintf(buf2, limit, "<STRIKE>%s</STRIKE>", buf);
-                strcpy(buf, buf2);
-        }
+	if (font_options & OPT_FONT_STRIKE) {
+		g_snprintf(buf2, limit, "<STRIKE>%s</STRIKE>", buf);
+		strcpy(buf, buf2);
+	}
 
-        if ((font_options & OPT_FONT_FACE) || c->hasfont) {
-                g_snprintf(buf2, limit, "<FONT FACE=\"%s\">%s</FONT>", c->fontface, buf);
-                strcpy(buf, buf2);
-        }
+	if ((font_options & OPT_FONT_FACE) || c->hasfont) {
+		g_snprintf(buf2, limit, "<FONT FACE=\"%s\">%s</FONT>", c->fontface, buf);
+		strcpy(buf, buf2);
+	}
 
 	if ((font_options & OPT_FONT_FGCOL) || c->hasfg) {
-		g_snprintf(buf2, limit, "<FONT COLOR=\"#%02X%02X%02X\">%s</FONT>", c->fgcol.red, c->fgcol.green, c->fgcol.blue, buf);
+		g_snprintf(buf2, limit, "<FONT COLOR=\"#%02X%02X%02X\">%s</FONT>", c->fgcol.red,
+			   c->fgcol.green, c->fgcol.blue, buf);
 		strcpy(buf, buf2);
 	}
 
 	if ((font_options & OPT_FONT_BGCOL) || c->hasbg) {
-		g_snprintf(buf2, limit, "<BODY BGCOLOR=\"#%02X%02X%02X\">%s</BODY>", c->bgcol.red, c->bgcol.green, c->bgcol.blue, buf);
+		g_snprintf(buf2, limit, "<BODY BGCOLOR=\"#%02X%02X%02X\">%s</BODY>", c->bgcol.red,
+			   c->bgcol.green, c->bgcol.blue, buf);
 		strcpy(buf, buf2);
 	}
 
@@ -662,13 +678,13 @@
 		g_snprintf(buf, limit, "%s", buffy);
 		g_free(buffy);
 	}
-        
+
 	if (!c->is_chat) {
 		buf3 = g_strdup(buf);
 		write_to_conv(c, buf3, WFLAG_SEND, NULL);
 		g_free(buf3);
 
-	        serv_send_im(c->gc, c->name, buf, 0);
+		serv_send_im(c->gc, c->name, buf, 0);
 
 		if (c->makesound && (sound_options & OPT_SOUND_SEND))
 			play_sound(SEND);
@@ -677,7 +693,7 @@
 
 		/* no sound because we do that when we receive our message */
 	}
-        
+
 	quiet_set(c->bold, FALSE);
 	quiet_set(c->strike, FALSE);
 	quiet_set(c->italic, FALSE);
@@ -686,7 +702,7 @@
 	quiet_set(c->fgcolorbtn, FALSE);
 	quiet_set(c->bgcolorbtn, FALSE);
 	quiet_set(c->link, FALSE);
-        
+
 	if ((general_options & OPT_GEN_BACK_ON_IM) && awaymessage != NULL) {
 		do_im_back();
 	}
@@ -698,8 +714,8 @@
 
 int entry_key_pressed(GtkWidget *w, GtkWidget *entry)
 {
-        check_everything(w);
-        return TRUE;
+	check_everything(w);
+	return TRUE;
 }
 
 /*------------------------------------------------------------------------*/
@@ -709,19 +725,19 @@
 int count_tag(GtkWidget *entry, char *s1, char *s2)
 {
 	char *p1, *p2;
-	int res=0;
+	int res = 0;
 	char *tmp, *tmpo, h;
-	tmpo = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1); 
+	tmpo = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 	h = tmpo[GTK_EDITABLE(entry)->current_pos];
-	tmpo[GTK_EDITABLE(entry)->current_pos]='\0';
-	tmp=tmpo;
+	tmpo[GTK_EDITABLE(entry)->current_pos] = '\0';
+	tmp = tmpo;
 	do {
 		p1 = strstr(tmp, s1);
 		p2 = strstr(tmp, s2);
 		if (p1 && p2) {
 			if (p1 < p2) {
-				res=1;
-				tmp = p1 +strlen(s1);
+				res = 1;
+				tmp = p1 + strlen(s1);
 			} else if (p2 < p1) {
 				res = 0;
 				tmp = p2 + strlen(s2);
@@ -736,7 +752,7 @@
 			}
 		}
 	} while (p1 || p2);
-	tmpo[GTK_EDITABLE(entry)->current_pos]=h;
+	tmpo[GTK_EDITABLE(entry)->current_pos] = h;
 	g_free(tmpo);
 	return res;
 }
@@ -747,13 +763,14 @@
 	int start = GTK_EDITABLE(entry)->selection_start_pos;
 	int finish = GTK_EDITABLE(entry)->selection_end_pos;
 	char *s;
-	
-	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1); 
+
+	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 	if (!strncasecmp(&s[start], s1, strlen(s1)) &&
 	    !strncasecmp(&s[finish - strlen(s2)], s2, strlen(s2))) {
-	   	if (really) {
-	    		gtk_editable_delete_text(GTK_EDITABLE(entry), start, start + strlen(s1));
-			gtk_editable_delete_text(GTK_EDITABLE(entry), finish - strlen(s2) - strlen(s1), finish - strlen(s1));
+		if (really) {
+			gtk_editable_delete_text(GTK_EDITABLE(entry), start, start + strlen(s1));
+			gtk_editable_delete_text(GTK_EDITABLE(entry), finish - strlen(s2) - strlen(s1),
+						 finish - strlen(s1));
 		}
 		g_free(s);
 		return 1;
@@ -771,75 +788,74 @@
 	int temp;
 	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 	t = s;
-	
-	if (start > finish)
-	{
+
+	if (start > finish) {
 		temp = start;
 		start = finish;
 		finish = temp;
 	}
-	
-	if (strstr(tag, "<FONT SIZE="))
-	{
-		while((t = strstr(t, "<FONT SIZE="))) {
-			if (((t-s) < finish) && ((t-s) >= start)) {
-				gtk_editable_delete_text(GTK_EDITABLE(entry), (t-s), (t-s) + strlen(tag));
+
+	if (strstr(tag, "<FONT SIZE=")) {
+		while ((t = strstr(t, "<FONT SIZE="))) {
+			if (((t - s) < finish) && ((t - s) >= start)) {
+				gtk_editable_delete_text(GTK_EDITABLE(entry), (t - s),
+							 (t - s) + strlen(tag));
 				g_free(s);
 				s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 				t = s;
-			}
-			else t++;
+			} else
+				t++;
 		}
-	}
-	else
-	{
-		while((t = strstr(t, tag))) {
-			if (((t-s) < finish) && ((t-s) >= start)) {
-				gtk_editable_delete_text(GTK_EDITABLE(entry), (t-s), (t-s) + strlen(tag));
+	} else {
+		while ((t = strstr(t, tag))) {
+			if (((t - s) < finish) && ((t - s) >= start)) {
+				gtk_editable_delete_text(GTK_EDITABLE(entry), (t - s),
+							 (t - s) + strlen(tag));
 				g_free(s);
 				s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 				t = s;
-			}
-			else t++;
+			} else
+				t++;
 		}
 	}
 	g_free(s);
 }
 
-static char* add_br(char* p) {
+static char *add_br(char *p)
+{
 
-    char* temp_p = p;
-    char* buffer_p;
-    char* buffer_start;
-    int   num_cr = 0;
-    int   char_len = 0;
+	char *temp_p = p;
+	char *buffer_p;
+	char *buffer_start;
+	int num_cr = 0;
+	int char_len = 0;
 
-    while( *temp_p != '\0' ) {
-	char_len++;
-	if( *temp_p == '\n' )
-	    num_cr++;
-	++temp_p;
-    }
+	while (*temp_p != '\0') {
+		char_len++;
+		if (*temp_p == '\n')
+			num_cr++;
+		++temp_p;
+	}
 
-    temp_p = p;
-    buffer_p = g_malloc(char_len + ( 4 * num_cr ) + 1);
-    buffer_start = buffer_p;
+	temp_p = p;
+	buffer_p = g_malloc(char_len + (4 * num_cr) + 1);
+	buffer_start = buffer_p;
 
-    while( *temp_p != '\0' ) {
-	*buffer_p = *temp_p;
-	if( *temp_p == '\n' ) {
-	    *buffer_p++ = '<';
-	    *buffer_p++ = 'B';
-	    *buffer_p++ = 'R';
-	    *buffer_p++ = '>';
-	    *buffer_p = '\n';
+	while (*temp_p != '\0') {
+		*buffer_p = *temp_p;
+		if (*temp_p == '\n') {
+			*buffer_p++ = '<';
+			*buffer_p++ = 'B';
+			*buffer_p++ = 'R';
+			*buffer_p++ = '>';
+			*buffer_p = '\n';
+		}
+		++buffer_p;
+		++temp_p;
 	}
-	++buffer_p;
-	++temp_p;
-    }
-    *buffer_p = '\0';
+	*buffer_p = '\0';
 
-    return buffer_start;
+	return buffer_start;
 }
 
 void surround(GtkWidget *entry, char *pre, char *post)
@@ -866,28 +882,26 @@
 		gtk_editable_insert_text(GTK_EDITABLE(entry), pre, strlen(pre), &dummy);
 		dummy = finish + strlen(pre);
 		gtk_editable_insert_text(GTK_EDITABLE(entry), post, strlen(post), &dummy);
-		gtk_editable_select_region(GTK_EDITABLE(entry), start, finish + strlen(pre) + strlen(post));
+		gtk_editable_select_region(GTK_EDITABLE(entry), start,
+					   finish + strlen(pre) + strlen(post));
 	} else {
 		temp = pos;
 		gtk_editable_insert_text(GTK_EDITABLE(entry), pre, strlen(pre), &pos);
-		if (temp == pos)
-		{
+		if (temp == pos) {
 			dummy = pos + strlen(pre);
 			gtk_editable_insert_text(GTK_EDITABLE(entry), post, strlen(post), &dummy);
 			gtk_editable_set_position(GTK_EDITABLE(entry), dummy);
-		}
-		else
-		{
+		} else {
 			dummy = pos;
 			gtk_editable_insert_text(GTK_EDITABLE(entry), post, strlen(post), &dummy);
 			gtk_editable_set_position(GTK_EDITABLE(entry), pos);
 		}
 	}
-	
+
 	if (general_options & OPT_GEN_CHECK_SPELLING) {
 		gtkspell_attach(GTK_TEXT(entry));
 	}
-	
+
 	gtk_widget_grab_focus(entry);
 }
 
@@ -900,7 +914,7 @@
 	s = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
 	pos = GTK_EDITABLE(entry)->current_pos;
 	debug_printf(_("Currently at %d, "), pos);
-	s2= strstr(&s[pos], post);
+	s2 = strstr(&s[pos], post);
 	if (s2) {
 		pos = s2 - s + strlen(post);
 	} else {
@@ -915,25 +929,25 @@
 void toggle_fg_color(GtkWidget *color, struct conversation *c)
 {
 	if (state_lock)
-                return;
+		return;
 	if (GTK_TOGGLE_BUTTON(color)->active)
 		show_fgcolor_dialog(c, color);
 	else if (c->fg_color_dialog)
 		cancel_fgcolor(color, c);
 	else
-		advance_past(c->entry, "<FONT COLOR>", "</FONT>" );
+		advance_past(c->entry, "<FONT COLOR>", "</FONT>");
 }
 
 void toggle_bg_color(GtkWidget *color, struct conversation *c)
 {
 	if (state_lock)
-                return;
+		return;
 	if (GTK_TOGGLE_BUTTON(color)->active)
 		show_bgcolor_dialog(c, color);
 	else if (c->bg_color_dialog)
 		cancel_bgcolor(color, c);
 	else
-		advance_past(c->entry, "<BODY BGCOLOR>", "</BODY>" );
+		advance_past(c->entry, "<BODY BGCOLOR>", "</BODY>");
 }
 
 void toggle_font(GtkWidget *font, struct conversation *c)
@@ -964,9 +978,9 @@
 {
 	if (state_lock)
 		return;
-	
+
 	if (GTK_TOGGLE_BUTTON(strike)->active)
-		surround(entry, "<STRIKE>","</STRIKE>");
+		surround(entry, "<STRIKE>", "</STRIKE>");
 	else
 		advance_past(entry, "<STRIKE>", "</STRIKE>");
 
@@ -977,7 +991,7 @@
 	if (state_lock)
 		return;
 	if (GTK_TOGGLE_BUTTON(bold)->active)
-		surround(entry, "<B>","</B>");
+		surround(entry, "<B>", "</B>");
 	else
 		advance_past(entry, "<B>", "</B>");
 }
@@ -987,7 +1001,7 @@
 	if (state_lock)
 		return;
 	if (GTK_TOGGLE_BUTTON(underline)->active)
-		surround(entry, "<U>","</U>");
+		surround(entry, "<U>", "</U>");
 	else
 		advance_past(entry, "<U>", "</U>");
 }
@@ -997,7 +1011,7 @@
 	if (state_lock)
 		return;
 	if (GTK_TOGGLE_BUTTON(italic)->active)
-		surround(entry, "<I>","</I>");
+		surround(entry, "<I>", "</I>");
 	else
 		advance_past(entry, "<I>", "</I>");
 }
@@ -1009,21 +1023,21 @@
 {
 	if (state_lock)
 		return;
-	surround(entry, "<FONT SIZE=\"1\">","</FONT>");
+	surround(entry, "<FONT SIZE=\"1\">", "</FONT>");
 }
 
 void do_normal(GtkWidget *normal, GtkWidget *entry)
 {
 	if (state_lock)
-                 return;
-	surround(entry, "<FONT SIZE=\"3\">","</FONT>");
+		return;
+	surround(entry, "<FONT SIZE=\"3\">", "</FONT>");
 }
 
 void do_big(GtkWidget *big, GtkWidget *entry)
 {
 	if (state_lock)
 		return;
-	surround(entry, "<FONT SIZE=\"5\">","</FONT>");
+	surround(entry, "<FONT SIZE=\"5\">", "</FONT>");
 }
 
 void check_everything(GtkWidget *entry)
@@ -1031,34 +1045,35 @@
 	struct conversation *c;
 
 	c = (struct conversation *)gtk_object_get_user_data(GTK_OBJECT(entry));
-	if (!c) return;
+	if (!c)
+		return;
 	if (invert_tags(entry, "<B>", "</B>", 0))
 		quiet_set(c->bold, TRUE);
-	else if (count_tag(entry, "<B>", "</B>")) 
+	else if (count_tag(entry, "<B>", "</B>"))
 		quiet_set(c->bold, TRUE);
 	else
-		quiet_set(c->bold,FALSE);
+		quiet_set(c->bold, FALSE);
 	if (invert_tags(entry, "<I>", "</I>", 0))
 		quiet_set(c->italic, TRUE);
-	else if (count_tag(entry, "<I>", "</I>"))  
+	else if (count_tag(entry, "<I>", "</I>"))
 		quiet_set(c->italic, TRUE);
 	else
 		quiet_set(c->italic, FALSE);
-     
+
 	if (invert_tags(entry, "<FONT COLOR", "</FONT>", 0))
 		quiet_set(c->fgcolorbtn, TRUE);
- 	else if (count_tag(entry, "<FONT COLOR", "</FONT>"))
+	else if (count_tag(entry, "<FONT COLOR", "</FONT>"))
 		quiet_set(c->fgcolorbtn, TRUE);
 	else
 		quiet_set(c->fgcolorbtn, FALSE);
-	
+
 	if (invert_tags(entry, "<BODY BGCOLOR", "</BODY>", 0))
 		quiet_set(c->bgcolorbtn, TRUE);
- 	else if (count_tag(entry, "<BODY BGCOLOR", "</BODY>"))
+	else if (count_tag(entry, "<BODY BGCOLOR", "</BODY>"))
 		quiet_set(c->bgcolorbtn, TRUE);
 	else
 		quiet_set(c->bgcolorbtn, FALSE);
-	
+
 	if (invert_tags(entry, "<FONT FACE", "</FONT>", 0))
 		quiet_set(c->font, TRUE);
 	else if (count_tag(entry, "<FONT FACE", "</FONT>"))
@@ -1072,13 +1087,13 @@
 		quiet_set(c->link, TRUE);
 	else
 		quiet_set(c->link, FALSE);
-	
- 	if (invert_tags(entry, "<U>", "</U>", 0))
+
+	if (invert_tags(entry, "<U>", "</U>", 0))
 		quiet_set(c->underline, TRUE);
 	else if (count_tag(entry, "<U>", "</U>"))
 		quiet_set(c->underline, TRUE);
 	else
-		quiet_set(c->underline, FALSE);  
+		quiet_set(c->underline, FALSE);
 
 	if (invert_tags(entry, "<STRIKE>", "</STRIKE>", 0))
 		quiet_set(c->strike, TRUE);
@@ -1094,13 +1109,15 @@
 /*------------------------------------------------------------------------*/
 
 
-static GdkPixmap *is_smiley(GtkWidget *window, char *m, int *len, GdkColor *trans) {
+static GdkPixmap *is_smiley(GtkWidget *window, char *m, int *len, GdkColor * trans)
+{
 	GdkBitmap *mask;
 	GdkPixmap *face = NULL;
 
-	if (strlen(m) < 2) return face;
+	if (strlen(m) < 2)
+		return face;
 	*len = 2;
-	if (	   !strncmp(m, ":)", 2)) {
+	if (!strncmp(m, ":)", 2)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, smile_xpm);
 	} else if (!strncmp(m, ":(", 2)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, sad_xpm);
@@ -1108,9 +1125,10 @@
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, wink_xpm);
 	}
 
-	if (face || strlen(m) < 3) return face;
+	if (face || strlen(m) < 3)
+		return face;
 	*len = 3;
-	if (	   !strncmp(m, ":-)", 3)) {
+	if (!strncmp(m, ":-)", 3)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, smile_xpm);
 	} else if (!strncmp(m, "O-)", 3)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, oneeye_xpm);
@@ -1120,8 +1138,7 @@
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, sad_xpm);
 	} else if (!strncmp(m, ";-)", 3)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, wink_xpm);
-	} else if (!strncmp(m, ":-p", 3) ||
-		   !strncmp(m, ":-P", 3)) {
+	} else if (!strncmp(m, ":-p", 3) || !strncmp(m, ":-P", 3)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, tongue_xpm);
 	} else if (!strncmp(m, "=-O", 3)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, scream_xpm);
@@ -1139,8 +1156,7 @@
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, embarrassed_xpm);
 	} else if (!strncmp(m, ":'(", 3)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, cry_xpm);
-	} else if (!strncmp(m, ":-\\", 3) ||
-		   !strncmp(m, ":-/", 3)) {
+	} else if (!strncmp(m, ":-\\", 3) || !strncmp(m, ":-/", 3)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, think_xpm);
 	} else if (!strncmp(m, ":-X", 3)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, crossedlips_xpm);
@@ -1148,18 +1164,19 @@
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, bigsmile_xpm);
 	}
 
-	if (face || strlen(m) < 4) return face;
+	if (face || strlen(m) < 4)
+		return face;
 	*len = 4;
-	if (	   !strncmp(m, "O:-)", 4)) {
+	if (!strncmp(m, "O:-)", 4)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, angel_xpm);
-	}
-	else if (!strncmp(m, "C:-)", 4)) {
+	} else if (!strncmp(m, "C:-)", 4)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, luke03_xpm);
 	}
 
-	if (face || strlen(m) < 6) return face;
+	if (face || strlen(m) < 6)
+		return face;
 	*len = 6;
-	if (	   !strncmp(m, "&gt;:o", 6)) {
+	if (!strncmp(m, "&gt;:o", 6)) {
 		face = gdk_pixmap_create_from_xpm_d(window->window, &mask, trans, yell_xpm);
 	}
 
@@ -1176,15 +1193,14 @@
 	GdkColor *trans = &window->style->base[GTK_STATE_NORMAL];
 	gboolean in_tag = FALSE;
 	int gtk_font_options = 0;
-			
-	if (display_options & OPT_DISP_IGNORE_COLOUR)	
+
+	if (display_options & OPT_DISP_IGNORE_COLOUR)
 		gtk_font_options = gtk_font_options ^ HTML_OPTION_NO_COLOURS;
 
-	if (display_options & OPT_DISP_IGNORE_FONTS) 
+	if (display_options & OPT_DISP_IGNORE_FONTS)
 		gtk_font_options = gtk_font_options ^ HTML_OPTION_NO_FONTS;
 
-	for (i = 0; i < strlen(what); i++)
-	{
+	for (i = 0; i < strlen(what); i++) {
 		if (!in_tag) {
 			int len;
 			if (what[i] == '<') {
@@ -1194,7 +1210,7 @@
 			} else if ((face = is_smiley(window, &what[i], &len, trans)) != NULL) {
 
 				buf2[y] = 0;
-				gtk_html_append_text(GTK_HTML(html), buf2,  gtk_font_options);
+				gtk_html_append_text(GTK_HTML(html), buf2, gtk_font_options);
 				gtk_html_add_pixmap(GTK_HTML(html), face, 0, 0);
 				y = 0;
 				i += len - 1;
@@ -1210,8 +1226,7 @@
 		}
 	}
 
-	if (y)
-	{
+	if (y) {
 		buf2[y] = 0;
 		gtk_html_append_text(GTK_HTML(html), buf2, gtk_font_options);
 	}
@@ -1225,18 +1240,18 @@
 	char *buf = g_malloc(BUF_LONG);
 	char buf2[1024];
 	char *str;
-        FILE *fd;
-        char colour[10];
+	FILE *fd;
+	char colour[10];
 	int colorv = -1;
 	char *clr;
 	char *smiley = g_malloc(7);
 	struct buddy *b;
 	int gtk_font_options = 0;
-			
-	if (display_options & OPT_DISP_IGNORE_COLOUR)	
+
+	if (display_options & OPT_DISP_IGNORE_COLOUR)
 		gtk_font_options = gtk_font_options ^ HTML_OPTION_NO_COLOURS;
 
-	if (display_options & OPT_DISP_IGNORE_FONTS) 
+	if (display_options & OPT_DISP_IGNORE_FONTS)
 		gtk_font_options = gtk_font_options ^ HTML_OPTION_NO_FONTS;
 
 
@@ -1259,29 +1274,29 @@
 		if (b)
 			who = b->show;
 	}
-	
-        if (flags & WFLAG_SYSTEM) {
+
+	if (flags & WFLAG_SYSTEM) {
 
-                gtk_html_freeze(GTK_HTML(c->text));
-        
-                gtk_html_append_text(GTK_HTML(c->text), what, 0);
-		
+		gtk_html_freeze(GTK_HTML(c->text));
+
+		gtk_html_append_text(GTK_HTML(c->text), what, 0);
+
 		gtk_html_append_text(GTK_HTML(c->text), "<BR>", 0);
 
-                if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) {
-                        char *t1;
+		if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) {
+			char *t1;
 			char nm[256];
 
-                        if (general_options & OPT_GEN_STRIP_HTML) {
-                                t1 = strip_html(what);
-                        } else {
-                                t1 = what;
-                        }
+			if (general_options & OPT_GEN_STRIP_HTML) {
+				t1 = strip_html(what);
+			} else {
+				t1 = what;
+			}
 			if (c->is_chat)
 				g_snprintf(nm, 256, "%s.chat", c->name);
 			else
 				g_snprintf(nm, 256, "%s", c->name);
-                        fd = open_log_file(nm);
+			fd = open_log_file(nm);
 			if (fd > 0) {
 				if (general_options & OPT_GEN_STRIP_HTML) {
 					fprintf(fd, "%s\n", t1);
@@ -1290,12 +1305,12 @@
 				}
 				fclose(fd);
 			}
-                        if (general_options & OPT_GEN_STRIP_HTML) {
-                                g_free(t1);
-                        }
-                }
-                
-        } else {
+			if (general_options & OPT_GEN_STRIP_HTML) {
+				g_free(t1);
+			}
+		}
+
+	} else {
 		if ((clr = strstr(what, "<BODY BGCOLOR=\"#")) != NULL) {
 			sscanf(clr + strlen("<BODY BGCOLOR=\"#"), "%x", &colorv);
 		}
@@ -1325,21 +1340,22 @@
 					g_snprintf(str, 62, "%s %s", who, AUTO_RESPONSE);
 				else
 					g_snprintf(str, 62, "%s:", who);
-		                if (flags & WFLAG_RECV)
-		                        strcpy(colour, "#ff0000");
+				if (flags & WFLAG_RECV)
+					strcpy(colour, "#ff0000");
 				else if (flags & WFLAG_SEND)
-		                        strcpy(colour, "#0000ff");
+					strcpy(colour, "#0000ff");
 			}
 		}
 
 		if (display_options & OPT_DISP_SHOW_TIME)
-			g_snprintf(buf, BUF_LONG, "<FONT COLOR=\"%s\"><B>%s %s</B></FONT> ", colour, date(), str);
+			g_snprintf(buf, BUF_LONG, "<FONT COLOR=\"%s\"><B>%s %s</B></FONT> ", colour,
+				   date(), str);
 		else
 			g_snprintf(buf, BUF_LONG, "<FONT COLOR=\"%s\"><B>%s</B></FONT>", colour, str);
 
 		g_free(str);
 
-                gtk_html_freeze(GTK_HTML(c->text));
+		gtk_html_freeze(GTK_HTML(c->text));
 
 		if (colorv != -1) {
 			sprintf(buf2, "<BODY BGCOLOR=\"#%x\">", colorv);
@@ -1348,37 +1364,34 @@
 
 		gtk_html_append_text(GTK_HTML(c->text), buf, 0);
 
-		if (display_options & OPT_DISP_SHOW_SMILEY)
-		{
+		if (display_options & OPT_DISP_SHOW_SMILEY) {
 			write_html_with_smileys(c->window, c->text, what);
-		}
-		else
-		{
+		} else {
 			gtk_html_append_text(GTK_HTML(c->text), what, gtk_font_options);
 		}
 
 		if (colorv != -1) {
 			gtk_html_append_text(GTK_HTML(c->text), "</BODY>", gtk_font_options);
 		}
-                gtk_html_append_text(GTK_HTML(c->text), "<BR>", gtk_font_options);
+		gtk_html_append_text(GTK_HTML(c->text), "<BR>", gtk_font_options);
 
 
-                if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) {
-                        char *t1, *t2;
+		if ((general_options & OPT_GEN_LOG_ALL) || find_log_info(c->name)) {
+			char *t1, *t2;
 			char *nm = g_malloc(256);
 			if (c->is_chat)
 				g_snprintf(nm, 256, "%s.chat", c->name);
 			else
 				g_snprintf(nm, 256, "%s", c->name);
 
-                        if (general_options & OPT_GEN_STRIP_HTML) {
-                                t1 = strip_html(buf);
-                                t2 = strip_html(what);
-                        } else {
-                                t1 = add_br(buf);
-                                t2 = add_br(what);
-                        }
-                        fd = open_log_file(nm);
+			if (general_options & OPT_GEN_STRIP_HTML) {
+				t1 = strip_html(buf);
+				t2 = strip_html(what);
+			} else {
+				t1 = add_br(buf);
+				t2 = add_br(what);
+			}
+			fd = open_log_file(nm);
 			if (fd > 0) {
 				if (general_options & OPT_GEN_STRIP_HTML) {
 					fprintf(fd, "%s%s\n", t1, t2);
@@ -1387,11 +1400,11 @@
 				}
 				fclose(fd);
 			}
-                        g_free(t1);
-                        g_free(t2);
+			g_free(t1);
+			g_free(t2);
 			g_free(nm);
-                }
-        }
+		}
+	}
 
 /*        if (!GTK_WIDGET_MAPPED(c->window)) {
                 
@@ -1402,23 +1415,27 @@
 	}
 */
 
-        if ((c->is_chat && (general_options & OPT_GEN_POPUP_CHAT)) ||
-	   (!c->is_chat && (general_options & OPT_GEN_POPUP_WINDOWS)))
-                gdk_window_show(c->window->window);
+	if ((c->is_chat && (general_options & OPT_GEN_POPUP_CHAT)) ||
+	    (!c->is_chat && (general_options & OPT_GEN_POPUP_WINDOWS)))
+		    gdk_window_show(c->window->window);
 
 	gtk_html_thaw(GTK_HTML(c->text));
 
-	g_free(smiley);        
+	g_free(smiley);
 	g_free(buf);
 }
 
 
 
-GtkWidget *build_conv_toolbar(struct conversation *c) {
-        GdkPixmap *strike_i, *small_i, *normal_i, *big_i, *bold_i, *italic_i, *underline_i, *speaker_i, *wood_i, *fgcolor_i, *bgcolor_i, *link_i, *font_i, *smiley_i;
-        GtkWidget *strike_p, *small_p, *normal_p, *big_p, *bold_p, *italic_p, *underline_p, *speaker_p, *wood_p, *fgcolor_p, *bgcolor_p, *link_p, *font_p, *smiley_p;
-        GtkWidget *strike, *small, *normal, *big, *bold, *italic, *underline, *speaker, *wood, *fgcolorbtn, *bgcolorbtn, *link, *font, *smiley;
-        GdkBitmap *mask;
+GtkWidget *build_conv_toolbar(struct conversation *c)
+{
+	GdkPixmap *strike_i, *small_i, *normal_i, *big_i, *bold_i, *italic_i, *underline_i, *speaker_i,
+	    *wood_i, *fgcolor_i, *bgcolor_i, *link_i, *font_i, *smiley_i;
+	GtkWidget *strike_p, *small_p, *normal_p, *big_p, *bold_p, *italic_p, *underline_p, *speaker_p,
+	    *wood_p, *fgcolor_p, *bgcolor_p, *link_p, *font_p, *smiley_p;
+	GtkWidget *strike, *small, *normal, *big, *bold, *italic, *underline, *speaker, *wood,
+	    *fgcolorbtn, *bgcolorbtn, *link, *font, *smiley;
+	GdkBitmap *mask;
 	GtkWidget *toolbar;
 	GtkWidget *win;
 	GtkWidget *entry;
@@ -1427,72 +1444,60 @@
 	win = c->window;
 	entry = c->entry;
 
-	link_i = gdk_pixmap_create_from_xpm_d(win->window, &mask,
-	     &win->style->white, link_xpm );
+	link_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, link_xpm);
 	link_p = gtk_pixmap_new(link_i, mask);
 	gtk_widget_show(link_p);
 	gdk_bitmap_unref(mask);
 
-	fgcolor_i = gdk_pixmap_create_from_xpm_d (win->window, &mask,
-             &win->style->white, fgcolor_xpm );
+	fgcolor_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, fgcolor_xpm);
 	fgcolor_p = gtk_pixmap_new(fgcolor_i, mask);
 	gtk_widget_show(fgcolor_p);
 	gdk_bitmap_unref(mask);
 
-	bgcolor_i = gdk_pixmap_create_from_xpm_d (win->window, &mask,
-             &win->style->white, bgcolor_xpm );
+	bgcolor_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, bgcolor_xpm);
 	bgcolor_p = gtk_pixmap_new(bgcolor_i, mask);
 	gtk_widget_show(bgcolor_p);
 	gdk_bitmap_unref(mask);
 
-	wood_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask, 
-	     &win->style->white, wood_xpm );
+	wood_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, wood_xpm);
 	wood_p = gtk_pixmap_new(wood_i, mask);
 	gtk_widget_show(wood_p);
 	gdk_bitmap_unref(mask);
-	speaker_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-             &win->style->white, speaker_xpm );
+	speaker_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, speaker_xpm);
 	speaker_p = gtk_pixmap_new(speaker_i, mask);
 	gtk_widget_show(speaker_p);
 	gdk_bitmap_unref(mask);
-	c->makesound=1;
-	strike_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-	     &win->style->white, strike_xpm );
+	c->makesound = 1;
+	strike_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, strike_xpm);
 	strike_p = gtk_pixmap_new(strike_i, mask);
 	gtk_widget_show(strike_p);
 	gdk_bitmap_unref(mask);
-	bold_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-             &win->style->white, bold_xpm );
+	bold_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, bold_xpm);
 	bold_p = gtk_pixmap_new(bold_i, mask);
 	gtk_widget_show(bold_p);
 	gdk_bitmap_unref(mask);
-	italic_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-             &win->style->white, italic_xpm );
+	italic_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, italic_xpm);
 	italic_p = gtk_pixmap_new(italic_i, mask);
 	gtk_widget_show(italic_p);
 	gdk_bitmap_unref(mask);
-	underline_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-	     &win->style->white, underline_xpm );
+	underline_i = gdk_pixmap_create_from_xpm_d(win->window, &mask,
+						   &win->style->white, underline_xpm);
 	underline_p = gtk_pixmap_new(underline_i, mask);
 	gtk_widget_show(underline_p);
 	gdk_bitmap_unref(mask);
-	small_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-             &win->style->white, small_xpm );
+	small_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, small_xpm);
 	small_p = gtk_pixmap_new(small_i, mask);
 	gtk_widget_show(small_p);
 	gdk_bitmap_unref(mask);
-	normal_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-             &win->style->white, normal_xpm );
+	normal_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, normal_xpm);
 	normal_p = gtk_pixmap_new(normal_i, mask);
 	gtk_widget_show(normal_p);
 	gdk_bitmap_unref(mask);
-	big_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-             &win->style->white, big_xpm );
+	big_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, big_xpm);
 	big_p = gtk_pixmap_new(big_i, mask);
 	gtk_widget_show(big_p);
 	gdk_bitmap_unref(mask);
-	font_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask,
-			&win->style->white, fontface_xpm );
+	font_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, &win->style->white, fontface_xpm);
 	font_p = gtk_pixmap_new(font_i, mask);
 	gtk_widget_show(font_p);
 	gdk_bitmap_unref(mask);
@@ -1502,81 +1507,83 @@
 	gdk_bitmap_unref(mask);
 
 	bold = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-						GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
-						_("Bold"), _("Bold Text"), _("Bold"), bold_p,
-						GTK_SIGNAL_FUNC(do_bold), entry);
-	italic = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), 
-						GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
+					  GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
+					  _("Bold"), _("Bold Text"), _("Bold"), bold_p,
+					  GTK_SIGNAL_FUNC(do_bold), entry);
+	italic = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
+					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
 					    NULL, _("Italics"), _("Italics Text"),
 					    _("Italics"), italic_p, GTK_SIGNAL_FUNC(do_italic), entry);
 	underline = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, _("Underline"), _("Underline Text"),
-					    _("Underline"), underline_p, GTK_SIGNAL_FUNC(do_underline), entry);
-	strike = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, _("Strike"), _("Strike through Text"),
-					    _("Strike"), strike_p, GTK_SIGNAL_FUNC(do_strike), entry);
+					       GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
+					       NULL, _("Underline"), _("Underline Text"),
+					       _("Underline"), underline_p,
+					       GTK_SIGNAL_FUNC(do_underline), entry);
+	strike =
+	    gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
+				       _("Strike"), _("Strike through Text"), _("Strike"), strike_p,
+				       GTK_SIGNAL_FUNC(do_strike), entry);
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 	small = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-						_("Small"), _("Decrease font size"), _("Small"),
-						small_p, GTK_SIGNAL_FUNC(do_small), entry);
+					_("Small"), _("Decrease font size"), _("Small"),
+					small_p, GTK_SIGNAL_FUNC(do_small), entry);
 	normal = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-						_("Normal"), _("Normal font size"), _("Normal"),
-						normal_p, GTK_SIGNAL_FUNC(do_normal), entry);
+					 _("Normal"), _("Normal font size"), _("Normal"),
+					 normal_p, GTK_SIGNAL_FUNC(do_normal), entry);
 	big = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
-						_("Big"), _("Increase font size"), _("Big"),
-						big_p, GTK_SIGNAL_FUNC(do_big), entry);
+				      _("Big"), _("Increase font size"), _("Big"),
+				      big_p, GTK_SIGNAL_FUNC(do_big), entry);
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
 	font = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-						GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-						NULL, _("Font"), _("Select Font"),
-						_("Font"), font_p, GTK_SIGNAL_FUNC(toggle_font), c);
+					  GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
+					  NULL, _("Font"), _("Select Font"),
+					  _("Font"), font_p, GTK_SIGNAL_FUNC(toggle_font), c);
 	fgcolorbtn = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, _("Color"), _("Text Color"),
-				 	    _("Color"), fgcolor_p, GTK_SIGNAL_FUNC(toggle_fg_color), c);
-	bgcolorbtn = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, _("Color"), _("Background Color"),
-				 	    _("Color"), bgcolor_p, GTK_SIGNAL_FUNC(toggle_bg_color), c);
+						GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
+						NULL, _("Color"), _("Text Color"),
+						_("Color"), fgcolor_p, GTK_SIGNAL_FUNC(toggle_fg_color),
+						c);
+	bgcolorbtn =
+	    gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
+				       _("Color"), _("Background Color"), _("Color"), bgcolor_p,
+				       GTK_SIGNAL_FUNC(toggle_bg_color), c);
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
 	link = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-						GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, _("Link"), _("Insert Link"),
-						_("Link"), link_p, GTK_SIGNAL_FUNC(toggle_link), c); 
+					  GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
+					  NULL, _("Link"), _("Insert Link"),
+					  _("Link"), link_p, GTK_SIGNAL_FUNC(toggle_link), c);
 	smiley = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-						GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-						NULL, _("Smiley"), _("Insert smiley face"), _("Smiley"),
-						 smiley_p, GTK_SIGNAL_FUNC(insert_smiley), c);
+					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
+					    NULL, _("Smiley"), _("Insert smiley face"), _("Smiley"),
+					    smiley_p, GTK_SIGNAL_FUNC(insert_smiley), c);
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
 	wood = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, _("Logging"), _("Enable logging"),
-						_("Logging"), wood_p, GTK_SIGNAL_FUNC(toggle_loggle), c);
-        speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-						GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, _("Sound"), _("Enable sounds"),
-					    _("Sound"), speaker_p, GTK_SIGNAL_FUNC(set_option), &c->makesound);
-	c->makesound=0;
+					  GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
+					  NULL, _("Logging"), _("Enable logging"),
+					  _("Logging"), wood_p, GTK_SIGNAL_FUNC(toggle_loggle), c);
+	speaker = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
+					     GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
+					     NULL, _("Sound"), _("Enable sounds"),
+					     _("Sound"), speaker_p, GTK_SIGNAL_FUNC(set_option),
+					     &c->makesound);
+	c->makesound = 0;
 	gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(speaker), TRUE);
-	
+
 	state_lock = 1;
 	if (find_log_info(c->name))
-		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), TRUE);
+		 gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), TRUE);
 	else
 		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), FALSE);
 	state_lock = 0;
 
 	/* use a slicker look if the user wants to */
-	if (display_options & OPT_DISP_COOL_LOOK)
-	{
+	if (display_options & OPT_DISP_COOL_LOOK) {
 		gtk_button_set_relief(GTK_BUTTON(strike), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(normal), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(big), GTK_RELIEF_NONE);
@@ -1585,14 +1592,14 @@
 		gtk_button_set_relief(GTK_BUTTON(underline), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(speaker), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(wood), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(fgcolorbtn),  GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(fgcolorbtn), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(bgcolorbtn), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(link), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(font), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(small), GTK_RELIEF_NONE);
 		gtk_button_set_relief(GTK_BUTTON(smiley), GTK_RELIEF_NONE);
 	}
-	
+
 	gtk_widget_show(toolbar);
 
 	gdk_pixmap_unref(link_i);
@@ -1609,7 +1616,7 @@
 	gdk_pixmap_unref(big_i);
 	gdk_pixmap_unref(font_i);
 	gdk_pixmap_unref(smiley_i);
-	
+
 	c->bold = bold;
 	c->strike = strike;
 	c->italic = italic;
@@ -1617,13 +1624,13 @@
 	c->log_button = wood;
 	c->fgcolorbtn = fgcolorbtn;
 	c->bgcolorbtn = bgcolorbtn;
-	c->link = link;  
+	c->link = link;
 	c->wood = wood;
 	c->font = font;
 	c->smiley = smiley;
 
 	gtk_widget_set_sensitive(c->log_button, ((general_options & OPT_GEN_LOG_ALL)) ? FALSE : TRUE);
-        
+
 	gtk_widget_set_sensitive(c->bold, ((font_options & OPT_FONT_BOLD)) ? FALSE : TRUE);
 	gtk_widget_set_sensitive(c->italic, ((font_options & OPT_FONT_ITALIC)) ? FALSE : TRUE);
 	gtk_widget_set_sensitive(c->underline, ((font_options & OPT_FONT_UNDERLINE)) ? FALSE : TRUE);
@@ -1632,7 +1639,7 @@
 	return toolbar;
 }
 
-static void convo_sel_send(GtkObject *m, struct gaim_connection *c)
+static void convo_sel_send(GtkObject * m, struct gaim_connection *c)
 {
 	struct conversation *cnv = gtk_object_get_user_data(m);
 	cnv->gc = c;
@@ -1643,7 +1650,7 @@
 	int dispstyle = set_dispstyle(0);
 	GtkWidget *parent = c->add->parent;
 	gtk_widget_destroy(c->add);
-	
+
 	if (c->gc && find_buddy(c->gc, c->name)) {
 		c->add = picture_button2(c->window, _("Remove"), gnome_remove_xpm, dispstyle);
 	} else {
@@ -1729,10 +1736,10 @@
 	GtkWidget *hbox;
 	GtkWidget *label;
 	int dispstyle = set_dispstyle(0);
-	
+
 	c->font_dialog = NULL;
-	c->fg_color_dialog = NULL;	
-	c->bg_color_dialog = NULL;	
+	c->fg_color_dialog = NULL;
+	c->bg_color_dialog = NULL;
 	c->smiley_dialog = NULL;
 	c->link_dialog = NULL;
 	c->log_dialog = NULL;
@@ -1752,7 +1759,7 @@
 	gtk_widget_realize(win);
 	aol_icon(win->window);
 	if ((find_log_info(c->name)) || ((general_options & OPT_GEN_LOG_ALL)))
-		g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, c->name);
+		 g_snprintf(buf, sizeof(buf), LOG_CONVERSATION_TITLE, c->name);
 	else
 		g_snprintf(buf, sizeof(buf), CONVERSATION_TITLE, c->name);
 	gtk_window_set_title(GTK_WINDOW(win), buf);
@@ -1767,10 +1774,8 @@
 	gtk_paned_pack1(GTK_PANED(paned), vbox, FALSE, TRUE);
 	gtk_widget_show(vbox);
 
-	sw = gtk_scrolled_window_new (NULL, NULL);
-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), 
-			GTK_POLICY_NEVER, 
-			GTK_POLICY_ALWAYS);
+	sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
 	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 	gtk_widget_set_usize(sw, 320, 175);
 	gtk_widget_show(sw);
@@ -1779,8 +1784,8 @@
 	c->text = text;
 	gtk_html_set_editable(GTK_HTML(text), FALSE);
 	gtk_container_add(GTK_CONTAINER(sw), text);
-	GTK_HTML (text)->hadj->step_increment = 10.0;
-	GTK_HTML (text)->vadj->step_increment = 10.0;
+	GTK_HTML(text)->hadj->step_increment = 10.0;
+	GTK_HTML(text)->vadj->step_increment = 10.0;
 	gtk_widget_show(text);
 
 	vbox2 = gtk_vbox_new(FALSE, 5);
@@ -1814,10 +1819,11 @@
 		gtk_widget_set_usize(entry, 300, 50);
 	else
 		gtk_widget_set_usize(entry, 300, 25);
-	gtk_window_set_focus(GTK_WINDOW(win),entry);
-	gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback),c);
+	gtk_window_set_focus(GTK_WINDOW(win), entry);
+	gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(send_callback), c);
 	gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(keypress_callback), c);
-	gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(entry_key_pressed), entry);
+	gtk_signal_connect(GTK_OBJECT(entry), "key_press_event", GTK_SIGNAL_FUNC(entry_key_pressed),
+			   entry);
 	if (general_options & OPT_GEN_CHECK_SPELLING)
 		gtkspell_attach(GTK_TEXT(c->entry));
 	gtk_box_pack_start(GTK_BOX(vbox2), entry, TRUE, TRUE, 0);
@@ -1832,14 +1838,14 @@
 	gtk_object_set_user_data(GTK_OBJECT(close), c);
 	gtk_signal_connect(GTK_OBJECT(close), "clicked", GTK_SIGNAL_FUNC(close_callback), c);
 	gtk_box_pack_end(GTK_BOX(bbox), close, dispstyle, dispstyle, 0);
-	gtk_widget_show(close);	
+	gtk_widget_show(close);
 
 	c->sep1 = gtk_vseparator_new();
 	gtk_box_pack_end(GTK_BOX(bbox), c->sep1, dispstyle, dispstyle, 0);
 	gtk_widget_show(c->sep1);
 
 	if (c->gc && find_buddy(c->gc, c->name) != NULL)
-		add = picture_button2(win, _("Remove"), gnome_remove_xpm, dispstyle);
+		 add = picture_button2(win, _("Remove"), gnome_remove_xpm, dispstyle);
 	else
 		add = picture_button2(win, _("Add"), gnome_add_xpm, dispstyle);
 	c->add = add;
@@ -1879,7 +1885,8 @@
 }
 
 
-void toggle_spellchk() {
+void toggle_spellchk()
+{
 	GList *cnv = conversations;
 	GSList *cht;
 	struct conversation *c;
diff -r 46c09828e929 -r 8342d3aab1f1 src/prefs.c
--- a/src/prefs.c	Wed Dec 13 22:12:02 2000 +0000
+++ b/src/prefs.c	Wed Dec 13 23:59:46 2000 +0000
@@ -77,7 +77,7 @@
 
 static void set_idle(GtkWidget *w, int *data)
 {
-        report_idle = (int)data;
+	report_idle = (int)data;
 	save_prefs();
 }
 
@@ -88,7 +88,9 @@
 	if (!set)
 		opt = gtk_radio_button_new_with_label(NULL, label);
 	else
-		opt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(set)), label);
+		opt =
+		    gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(set)),
+						    label);
 	gtk_box_pack_start(GTK_BOX(box), opt, FALSE, FALSE, 0);
 	gtk_signal_connect(GTK_OBJECT(opt), "clicked", GTK_SIGNAL_FUNC(set_idle), (void *)which);
 	gtk_widget_show(opt);
@@ -105,7 +107,7 @@
 	GtkWidget *label;
 	GtkWidget *sep;
 	GtkWidget *idle;
-	
+
 	parent = prefdialog->parent;
 	gtk_widget_destroy(prefdialog);
 
@@ -113,7 +115,7 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
@@ -122,17 +124,19 @@
 	gtk_widget_show(label);
 
 	/*
-	prefrem = gaim_button(_("Remember password"), &general_options, OPT_GEN_REMEMBER_PASS, box);
-	gtk_signal_connect(GTK_OBJECT(prefrem), "destroy", GTK_SIGNAL_FUNC(remdes), 0);
-	gaim_button(_("Auto-login"), &general_options, OPT_GEN_AUTO_LOGIN, box);
+	   prefrem = gaim_button(_("Remember password"), &general_options, OPT_GEN_REMEMBER_PASS, box);
+	   gtk_signal_connect(GTK_OBJECT(prefrem), "destroy", GTK_SIGNAL_FUNC(remdes), 0);
+	   gaim_button(_("Auto-login"), &general_options, OPT_GEN_AUTO_LOGIN, box);
 
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-	gtk_widget_show(sep);
-	*/
+	   sep = gtk_hseparator_new();
+	   gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
+	   gtk_widget_show(sep);
+	 */
 
-	gaim_button(_("Use borderless buttons (requires restart for some buttons)"), &display_options, OPT_DISP_COOL_LOOK, box);
-	gaim_button(_("Show Buddy Ticker after restart"), &display_options, OPT_DISP_SHOW_BUDDYTICKER, box);
+	gaim_button(_("Use borderless buttons (requires restart for some buttons)"), &display_options,
+		    OPT_DISP_COOL_LOOK, box);
+	gaim_button(_("Show Buddy Ticker after restart"), &display_options, OPT_DISP_SHOW_BUDDYTICKER,
+		    box);
 	if (!dw && (general_options & OPT_GEN_DEBUG))
 		general_options = general_options ^ OPT_GEN_DEBUG;
 	debugbutton = gaim_button(_("Show Debug Window"), &general_options, OPT_GEN_DEBUG, box);
@@ -149,7 +153,7 @@
 
 	label = gtk_label_new(_("Report Idle Times:"));
 	gtk_box_pack_start(GTK_BOX(box2), label, FALSE, FALSE, 5);
-	gtk_widget_show (label);
+	gtk_widget_show(label);
 	idle = idle_radio(_("None"), IDLE_NONE, box2, NULL);
 	idle = idle_radio(_("GAIM Use"), IDLE_GAIM, box2, idle);
 #ifdef USE_SCREENSAVER
@@ -173,7 +177,7 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
@@ -183,7 +187,8 @@
 
 	gaim_button(_("Save Window Size/Position"), &general_options, OPT_GEN_SAVED_WINDOWS, box);
 #ifdef USE_APPLET
-	gaim_button(_("Automatically show buddy list on sign on"), &general_options, OPT_GEN_APP_BUDDY_SHOW, box);
+	gaim_button(_("Automatically show buddy list on sign on"), &general_options,
+		    OPT_GEN_APP_BUDDY_SHOW, box);
 	gaim_button(_("Display Buddy List near applet"), &general_options, OPT_GEN_NEAR_APPLET, box);
 #endif
 
@@ -226,7 +231,7 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
@@ -261,7 +266,8 @@
 
 	gaim_button(_("Highlight misspelled words"), &general_options, OPT_GEN_CHECK_SPELLING, box);
 	gaim_button(_("Show URLs as links"), &general_options, OPT_GEN_SEND_LINKS, box);
-	gaim_button(_("Sending messages removes away status"), &general_options, OPT_GEN_BACK_ON_IM, box);
+	gaim_button(_("Sending messages removes away status"), &general_options, OPT_GEN_BACK_ON_IM,
+		    box);
 
 	gtk_widget_show(prefdialog);
 }
@@ -269,7 +275,7 @@
 static void set_buttons_opt(GtkWidget *w, int data)
 {
 	int mask;
-	if (data & 0x1) /* set the first bit if we're affecting chat buttons */
+	if (data & 0x1)		/* set the first bit if we're affecting chat buttons */
 		mask = (OPT_DISP_CHAT_BUTTON_TEXT | OPT_DISP_CHAT_BUTTON_XPM);
 	else
 		mask = (OPT_DISP_CONV_BUTTON_TEXT | OPT_DISP_CONV_BUTTON_XPM);
@@ -287,15 +293,14 @@
 	GtkWidget *menu, *opt;
 	int index;
 
-	switch (display_options & 
-		(OPT_DISP_CONV_BUTTON_TEXT | OPT_DISP_CONV_BUTTON_XPM)) {
+	switch (display_options & (OPT_DISP_CONV_BUTTON_TEXT | OPT_DISP_CONV_BUTTON_XPM)) {
 	case OPT_DISP_CONV_BUTTON_TEXT:
 		index = 2;
 		break;
 	case OPT_DISP_CONV_BUTTON_XPM:
 		index = 1;
 		break;
-	default: /* both or neither */
+	default:		/* both or neither */
 		index = 0;
 		break;
 	}
@@ -303,17 +308,20 @@
 	menu = gtk_menu_new();
 
 	opt = gtk_menu_item_new_with_label(_("Pictures and Text"));
-	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt), (void *)(OPT_DISP_CONV_BUTTON_TEXT | OPT_DISP_CONV_BUTTON_XPM));
+	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt),
+			   (void *)(OPT_DISP_CONV_BUTTON_TEXT | OPT_DISP_CONV_BUTTON_XPM));
 	gtk_widget_show(opt);
 	gtk_menu_append(GTK_MENU(menu), opt);
 
 	opt = gtk_menu_item_new_with_label(_("Pictures Only"));
-	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt), (void *)OPT_DISP_CONV_BUTTON_XPM);
+	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt),
+			   (void *)OPT_DISP_CONV_BUTTON_XPM);
 	gtk_widget_show(opt);
 	gtk_menu_append(GTK_MENU(menu), opt);
 
 	opt = gtk_menu_item_new_with_label(_("Text Only"));
-	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt), (void *)OPT_DISP_CONV_BUTTON_TEXT);
+	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt),
+			   (void *)OPT_DISP_CONV_BUTTON_TEXT);
 	gtk_widget_show(opt);
 	gtk_menu_append(GTK_MENU(menu), opt);
 
@@ -339,7 +347,7 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
@@ -362,9 +370,11 @@
 	im_buttons_menu_init(opt);
 	gtk_widget_show(opt);
 
-	gaim_button(_("Show larger entry box on new windows"), &display_options, OPT_DISP_CONV_BIG_ENTRY, box);
+	gaim_button(_("Show larger entry box on new windows"), &display_options, OPT_DISP_CONV_BIG_ENTRY,
+		    box);
 	gaim_button(_("Raise windows on events"), &general_options, OPT_GEN_POPUP_WINDOWS, box);
-	gaim_button(_("Ignore new conversations when away"), &general_options, OPT_GEN_DISCARD_WHEN_AWAY, box);
+	gaim_button(_("Ignore new conversations when away"), &general_options, OPT_GEN_DISCARD_WHEN_AWAY,
+		    box);
 	gaim_button(_("Ignore TiK Automated Messages"), &general_options, OPT_GEN_TIK_HACK, box);
 
 	gtk_widget_show(prefdialog);
@@ -375,15 +385,14 @@
 	GtkWidget *menu, *opt;
 	int index;
 
-	switch (display_options & 
-		(OPT_DISP_CHAT_BUTTON_TEXT | OPT_DISP_CHAT_BUTTON_XPM)) {
+	switch (display_options & (OPT_DISP_CHAT_BUTTON_TEXT | OPT_DISP_CHAT_BUTTON_XPM)) {
 	case OPT_DISP_CHAT_BUTTON_TEXT:
 		index = 2;
 		break;
 	case OPT_DISP_CHAT_BUTTON_XPM:
 		index = 1;
 		break;
-	default: /* both or neither */
+	default:		/* both or neither */
 		index = 0;
 		break;
 	}
@@ -391,17 +400,20 @@
 	menu = gtk_menu_new();
 
 	opt = gtk_menu_item_new_with_label(_("Pictures and Text"));
-	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt), (void *)(OPT_DISP_CHAT_BUTTON_TEXT | OPT_DISP_CHAT_BUTTON_XPM | 1));
+	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt),
+			   (void *)(OPT_DISP_CHAT_BUTTON_TEXT | OPT_DISP_CHAT_BUTTON_XPM | 1));
 	gtk_widget_show(opt);
 	gtk_menu_append(GTK_MENU(menu), opt);
 
 	opt = gtk_menu_item_new_with_label(_("Pictures Only"));
-	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt), (void *)(OPT_DISP_CHAT_BUTTON_XPM | 1));
+	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt),
+			   (void *)(OPT_DISP_CHAT_BUTTON_XPM | 1));
 	gtk_widget_show(opt);
 	gtk_menu_append(GTK_MENU(menu), opt);
 
 	opt = gtk_menu_item_new_with_label(_("Text Only"));
-	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt), (void *)(OPT_DISP_CHAT_BUTTON_TEXT | 1));
+	gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_buttons_opt),
+			   (void *)(OPT_DISP_CHAT_BUTTON_TEXT | 1));
 	gtk_widget_show(opt);
 	gtk_menu_append(GTK_MENU(menu), opt);
 
@@ -425,7 +437,7 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
@@ -433,7 +445,8 @@
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
 	gtk_widget_show(label);
 
-	gaim_button(_("Show people joining/leaving in window"), &display_options, OPT_DISP_CHAT_LOGON, box);
+	gaim_button(_("Show people joining/leaving in window"), &display_options, OPT_DISP_CHAT_LOGON,
+		    box);
 
 	hbox = gtk_hbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5);
@@ -449,7 +462,8 @@
 	gtk_widget_show(opt);
 
 
-	gaim_button(_("Show larger entry box on new windows"), &display_options, OPT_DISP_CHAT_BIG_ENTRY, box);
+	gaim_button(_("Show larger entry box on new windows"), &display_options, OPT_DISP_CHAT_BIG_ENTRY,
+		    box);
 	gaim_button(_("Raise windows on events"), &general_options, OPT_GEN_POPUP_CHAT, box);
 
 	gtk_widget_show(prefdialog);
@@ -464,155 +478,155 @@
 
 static void refresh_list(GtkWidget *w, gpointer *m)
 {
-        char *text = grab_url(NULL, "http://www.aol.com/community/chat/allchats.html");
-        char *c;
-        int len = strlen(text);
-        GtkWidget *item;
-        GList *items = GTK_LIST(cp->list1)->children;
-        struct chat_room *cr;
-        c = text;
+	char *text = grab_url(NULL, "http://www.aol.com/community/chat/allchats.html");
+	char *c;
+	int len = strlen(text);
+	GtkWidget *item;
+	GList *items = GTK_LIST(cp->list1)->children;
+	struct chat_room *cr;
+	c = text;
 
-        while(items) {
-                g_free(gtk_object_get_user_data(GTK_OBJECT(items->data)));
-                items = items->next;
-        }
+	while (items) {
+		g_free(gtk_object_get_user_data(GTK_OBJECT(items->data)));
+		items = items->next;
+	}
 
-        items = NULL;
+	items = NULL;
 
-        gtk_list_clear_items(GTK_LIST(cp->list1), 0, -1);
+	gtk_list_clear_items(GTK_LIST(cp->list1), 0, -1);
 
-        item = gtk_list_item_new_with_label(_("Gaim Chat"));
-        cr = g_new0(struct chat_room, 1);
-        strcpy(cr->name, _("Gaim Chat"));
-        cr->exchange = 4;
-        gtk_object_set_user_data(GTK_OBJECT(item), cr);
-        gtk_widget_show(item);
+	item = gtk_list_item_new_with_label(_("Gaim Chat"));
+	cr = g_new0(struct chat_room, 1);
+	strcpy(cr->name, _("Gaim Chat"));
+	cr->exchange = 4;
+	gtk_object_set_user_data(GTK_OBJECT(item), cr);
+	gtk_widget_show(item);
 
-        items = g_list_append(NULL, item);
+	items = g_list_append(NULL, item);
 
-        while(c) {
-                if (c - text > len - 30)
-                        break; /* assume no chat rooms 30 from end, padding */
-                if (!strncasecmp(AOL_SRCHSTR, c, strlen(AOL_SRCHSTR))) {
-                        char *t;
-                        int len=0;
-                        int exchange;
-                        char *name = NULL;
+	while (c) {
+		if (c - text > len - 30)
+			break;	/* assume no chat rooms 30 from end, padding */
+		if (!strncasecmp(AOL_SRCHSTR, c, strlen(AOL_SRCHSTR))) {
+			char *t;
+			int len = 0;
+			int exchange;
+			char *name = NULL;
 
-                        c += strlen(AOL_SRCHSTR);
-                        t = c;
-                        while(t) {
-                                len++;
-                                name = g_realloc(name, len);
-                                if (*t == '+')
-                                        name[len - 1] = ' ';
-                                else if (*t == '&') {
-                                        name[len - 1] = 0;
-                                        sscanf(t, "&Exchange=%d", &exchange);
-                                        c = t + strlen("&Exchange=x");
-                                        break;
-                                } else
-                                        name[len - 1] = *t;
-                                t++;
-                        }
-                        cr = g_new0(struct chat_room, 1);
-                        strcpy(cr->name, name);
-                        cr->exchange = exchange;
-                        item = gtk_list_item_new_with_label(name);
-                        gtk_widget_show(item);
-                        items = g_list_append(items, item);
-                        gtk_object_set_user_data(GTK_OBJECT(item), cr);
-                        g_free(name);
-                }
-                c++;
-        }
-        gtk_list_append_items(GTK_LIST(cp->list1), items);
-        g_free(text);
+			c += strlen(AOL_SRCHSTR);
+			t = c;
+			while (t) {
+				len++;
+				name = g_realloc(name, len);
+				if (*t == '+')
+					name[len - 1] = ' ';
+				else if (*t == '&') {
+					name[len - 1] = 0;
+					sscanf(t, "&Exchange=%d", &exchange);
+					c = t + strlen("&Exchange=x");
+					break;
+				} else
+					name[len - 1] = *t;
+				t++;
+			}
+			cr = g_new0(struct chat_room, 1);
+			strcpy(cr->name, name);
+			cr->exchange = exchange;
+			item = gtk_list_item_new_with_label(name);
+			gtk_widget_show(item);
+			items = g_list_append(items, item);
+			gtk_object_set_user_data(GTK_OBJECT(item), cr);
+			g_free(name);
+		}
+		c++;
+	}
+	gtk_list_append_items(GTK_LIST(cp->list1), items);
+	g_free(text);
 }
 
 static void add_chat(GtkWidget *w, gpointer *m)
 {
-        GList *sel = GTK_LIST(cp->list1)->selection;
-        struct chat_room *cr, *cr2;
-        GList *crs = chat_rooms;
-        GtkWidget *item;
+	GList *sel = GTK_LIST(cp->list1)->selection;
+	struct chat_room *cr, *cr2;
+	GList *crs = chat_rooms;
+	GtkWidget *item;
 
-        if (sel) {
-                cr = (struct chat_room *)gtk_object_get_user_data(GTK_OBJECT(sel->data));
-        } else
-                return;
+	if (sel) {
+		cr = (struct chat_room *)gtk_object_get_user_data(GTK_OBJECT(sel->data));
+	} else
+		return;
 
-        while(crs) {
-                cr2 = (struct chat_room *)crs->data;
-                if (!strcasecmp(cr->name, cr2->name))
-                        return;
-                crs = crs->next;
-        }
-        item = gtk_list_item_new_with_label(cr->name);
-        cr2 = g_new0(struct chat_room, 1);
-        strcpy(cr2->name, cr->name);
-        cr2->exchange = cr->exchange;
-        gtk_object_set_user_data(GTK_OBJECT(item), cr2);
-        gtk_widget_show(item);
-        sel = g_list_append(NULL, item);
-        gtk_list_append_items(GTK_LIST(cp->list2), sel);
-        chat_rooms = g_list_append(chat_rooms, cr2);
+	while (crs) {
+		cr2 = (struct chat_room *)crs->data;
+		if (!strcasecmp(cr->name, cr2->name))
+			 return;
+		crs = crs->next;
+	}
+	item = gtk_list_item_new_with_label(cr->name);
+	cr2 = g_new0(struct chat_room, 1);
+	strcpy(cr2->name, cr->name);
+	cr2->exchange = cr->exchange;
+	gtk_object_set_user_data(GTK_OBJECT(item), cr2);
+	gtk_widget_show(item);
+	sel = g_list_append(NULL, item);
+	gtk_list_append_items(GTK_LIST(cp->list2), sel);
+	chat_rooms = g_list_append(chat_rooms, cr2);
 
-        setup_buddy_chats();
-        save_prefs();
+	setup_buddy_chats();
+	save_prefs();
 
 
 }
 
 static void remove_chat(GtkWidget *w, gpointer *m)
 {
-        GList *sel = GTK_LIST(cp->list2)->selection;
-        struct chat_room *cr;
-        GList *crs;
-        GtkWidget *item;
+	GList *sel = GTK_LIST(cp->list2)->selection;
+	struct chat_room *cr;
+	GList *crs;
+	GtkWidget *item;
 
-        if (sel) {
-                item = (GtkWidget *)sel->data;
-                cr = (struct chat_room *)gtk_object_get_user_data(GTK_OBJECT(item));
-        } else
-                return;
+	if (sel) {
+		item = (GtkWidget *)sel->data;
+		cr = (struct chat_room *)gtk_object_get_user_data(GTK_OBJECT(item));
+	} else
+		return;
 
-        chat_rooms = g_list_remove(chat_rooms, cr);
+	chat_rooms = g_list_remove(chat_rooms, cr);
 
 
-        gtk_list_clear_items(GTK_LIST(cp->list2), 0, -1);
+	gtk_list_clear_items(GTK_LIST(cp->list2), 0, -1);
 
-        if (g_list_length(chat_rooms) == 0)
-                chat_rooms = NULL;
+	if (g_list_length(chat_rooms) == 0)
+		chat_rooms = NULL;
 
-        crs = chat_rooms;
+	crs = chat_rooms;
 
-        while(crs) {
-                cr = (struct chat_room *)crs->data;
-                item = gtk_list_item_new_with_label(cr->name);
-                gtk_object_set_user_data(GTK_OBJECT(item), cr);
-                gtk_widget_show(item);
-                gtk_list_append_items(GTK_LIST(cp->list2), g_list_append(NULL, item));
+	while (crs) {
+		cr = (struct chat_room *)crs->data;
+		item = gtk_list_item_new_with_label(cr->name);
+		gtk_object_set_user_data(GTK_OBJECT(item), cr);
+		gtk_widget_show(item);
+		gtk_list_append_items(GTK_LIST(cp->list2), g_list_append(NULL, item));
 
 
-                crs = crs->next;
-        }
+		crs = crs->next;
+	}
 
-        setup_buddy_chats();
-        save_prefs();
+	setup_buddy_chats();
+	save_prefs();
 }
 
 static void room_page()
 {
-        GtkWidget *table;
-        GtkWidget *rem_button, *add_button, *ref_button;
-        GtkWidget *list1, *list2;
-        GtkWidget *label;
-        GtkWidget *sw1, *sw2;
-        GtkWidget *item;
-        GList *crs = chat_rooms;
-        GList *items = NULL;
-        struct chat_room *cr;
+	GtkWidget *table;
+	GtkWidget *rem_button, *add_button, *ref_button;
+	GtkWidget *list1, *list2;
+	GtkWidget *label;
+	GtkWidget *sw1, *sw2;
+	GtkWidget *item;
+	GList *crs = chat_rooms;
+	GList *items = NULL;
+	struct chat_room *cr;
 
 	GtkWidget *parent;
 	GtkWidget *box;
@@ -628,94 +642,84 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
-        table = gtk_table_new(4, 2, FALSE);
-        gtk_widget_show(table);
+	table = gtk_table_new(4, 2, FALSE);
+	gtk_widget_show(table);
 
-        gtk_box_pack_start(GTK_BOX(box), table, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(box), table, TRUE, TRUE, 0);
 
-        list1 = gtk_list_new();
-        list2 = gtk_list_new();
-        sw1 = gtk_scrolled_window_new(NULL, NULL);
-        sw2 = gtk_scrolled_window_new(NULL, NULL);
-
-        ref_button = picture_button(prefs, _("Refresh"), refresh_xpm);
-        add_button = picture_button(prefs, _("Add"), gnome_add_xpm);
-        rem_button = picture_button(prefs, _("Remove"), gnome_remove_xpm);
-        gtk_widget_show(list1);
-        gtk_widget_show(sw1);
-        gtk_widget_show(list2);
-        gtk_widget_show(sw2);
+	list1 = gtk_list_new();
+	list2 = gtk_list_new();
+	sw1 = gtk_scrolled_window_new(NULL, NULL);
+	sw2 = gtk_scrolled_window_new(NULL, NULL);
 
-        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw1), list1);
-        gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw2), list2);
+	ref_button = picture_button(prefs, _("Refresh"), refresh_xpm);
+	add_button = picture_button(prefs, _("Add"), gnome_add_xpm);
+	rem_button = picture_button(prefs, _("Remove"), gnome_remove_xpm);
+	gtk_widget_show(list1);
+	gtk_widget_show(sw1);
+	gtk_widget_show(list2);
+	gtk_widget_show(sw2);
 
-        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw1),
-                                       GTK_POLICY_AUTOMATIC,GTK_POLICY_ALWAYS);
-        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw2),
-                                       GTK_POLICY_AUTOMATIC,GTK_POLICY_ALWAYS);
+	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw1), list1);
+	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw2), list2);
 
-        cp->list1 = list1;
-        cp->list2 = list2;
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw1),
+				       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw2),
+				       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
 
-        gtk_signal_connect(GTK_OBJECT(ref_button), "clicked",
-                           GTK_SIGNAL_FUNC(refresh_list), cp);
-        gtk_signal_connect(GTK_OBJECT(rem_button), "clicked",
-                           GTK_SIGNAL_FUNC(remove_chat), cp);
-        gtk_signal_connect(GTK_OBJECT(add_button), "clicked",
-                           GTK_SIGNAL_FUNC(add_chat), cp);
+	cp->list1 = list1;
+	cp->list2 = list2;
+
+	gtk_signal_connect(GTK_OBJECT(ref_button), "clicked", GTK_SIGNAL_FUNC(refresh_list), cp);
+	gtk_signal_connect(GTK_OBJECT(rem_button), "clicked", GTK_SIGNAL_FUNC(remove_chat), cp);
+	gtk_signal_connect(GTK_OBJECT(add_button), "clicked", GTK_SIGNAL_FUNC(add_chat), cp);
 
 
 
-        label = gtk_label_new(_("List of available chats"));
-        gtk_widget_show(label);
+	label = gtk_label_new(_("List of available chats"));
+	gtk_widget_show(label);
+
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+	gtk_table_attach(GTK_TABLE(table), ref_button, 0, 1, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+	gtk_table_attach(GTK_TABLE(table), sw1, 0, 1, 2, 3,
+			 GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 5);
+	gtk_table_attach(GTK_TABLE(table), add_button, 0, 1, 3, 4, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
-        gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1,
-                         GTK_SHRINK, GTK_SHRINK, 0, 0);
-        gtk_table_attach(GTK_TABLE(table), ref_button, 0, 1, 1, 2,
-                         GTK_SHRINK, GTK_SHRINK, 0, 0);
-        gtk_table_attach(GTK_TABLE(table), sw1, 0, 1, 2, 3,
-                         GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                         5, 5);
-        gtk_table_attach(GTK_TABLE(table), add_button, 0, 1, 3, 4,
-                         GTK_SHRINK, GTK_SHRINK, 0, 0);
+
+	label = gtk_label_new(_("List of subscribed chats"));
+	gtk_widget_show(label);
+
+	gtk_table_attach(GTK_TABLE(table), label, 1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+	gtk_table_attach(GTK_TABLE(table), sw2, 1, 2, 2, 3,
+			 GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 5, 5);
+	gtk_table_attach(GTK_TABLE(table), rem_button, 1, 2, 3, 4, GTK_SHRINK, GTK_SHRINK, 0, 0);
 
 
-        label = gtk_label_new(_("List of subscribed chats"));
-        gtk_widget_show(label);
-
-        gtk_table_attach(GTK_TABLE(table), label, 1, 2, 0, 1,
-                         GTK_SHRINK, GTK_SHRINK, 0, 0);
-        gtk_table_attach(GTK_TABLE(table), sw2, 1, 2, 2, 3,
-                         GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL,
-                         5, 5);
-        gtk_table_attach(GTK_TABLE(table), rem_button, 1, 2, 3, 4,
-                         GTK_SHRINK, GTK_SHRINK, 0, 0);
+	item = gtk_list_item_new_with_label(_("Gaim Chat"));
+	cr = g_new0(struct chat_room, 1);
+	strcpy(cr->name, _("Gaim Chat"));
+	cr->exchange = 4;
+	gtk_object_set_user_data(GTK_OBJECT(item), cr);
+	gtk_widget_show(item);
+	gtk_list_append_items(GTK_LIST(list1), g_list_append(NULL, item));
 
 
-        item = gtk_list_item_new_with_label(_("Gaim Chat"));
-        cr = g_new0(struct chat_room, 1);
-        strcpy(cr->name, _("Gaim Chat"));
-        cr->exchange = 4;
-        gtk_object_set_user_data(GTK_OBJECT(item), cr);
-        gtk_widget_show(item);
-        gtk_list_append_items(GTK_LIST(list1), g_list_append(NULL, item));
-
+	while (crs) {
+		cr = (struct chat_room *)crs->data;
+		item = gtk_list_item_new_with_label(cr->name);
+		gtk_object_set_user_data(GTK_OBJECT(item), cr);
+		gtk_widget_show(item);
+		items = g_list_append(items, item);
 
-        while(crs) {
-                cr = (struct chat_room *)crs->data;
-                item = gtk_list_item_new_with_label(cr->name);
-                gtk_object_set_user_data(GTK_OBJECT(item), cr);
-                gtk_widget_show(item);
-                items = g_list_append(items, item);
+		crs = crs->next;
+	}
 
-                crs = crs->next;
-        }
-
-        gtk_list_append_items(GTK_LIST(list2), items);
+	gtk_list_append_items(GTK_LIST(list2), items);
 
 	gtk_widget_show(prefdialog);
 }
@@ -814,7 +818,7 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
@@ -822,10 +826,10 @@
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
 	gtk_widget_show(label);
 
-        gaim_button(_("Bold Text"), &font_options, OPT_FONT_BOLD, box);
-        gaim_button(_("Italics Text"), &font_options, OPT_FONT_ITALIC, box);
-        gaim_button(_("Underlined Text"), &font_options, OPT_FONT_UNDERLINE, box);
-        gaim_button(_("Strike Text"), &font_options, OPT_FONT_STRIKE, box);
+	gaim_button(_("Bold Text"), &font_options, OPT_FONT_BOLD, box);
+	gaim_button(_("Italics Text"), &font_options, OPT_FONT_ITALIC, box);
+	gaim_button(_("Underlined Text"), &font_options, OPT_FONT_UNDERLINE, box);
+	gaim_button(_("Strike Text"), &font_options, OPT_FONT_STRIKE, box);
 
 	sep = gtk_hseparator_new();
 	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
@@ -834,7 +838,7 @@
 	hbox = gtk_hbox_new(FALSE, 5);
 	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5);
 	gtk_widget_show(hbox);
-	
+
 	pref_fg_picture = show_color_pref(hbox, TRUE);
 	button = gaim_button(_("Text Color"), &font_options, OPT_FONT_FGCOL, hbox);
 
@@ -846,12 +850,13 @@
 	gtk_widget_show(select);
 
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), select);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(update_color), pref_fg_picture);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(update_color),
+			   pref_fg_picture);
 
 	hbox = gtk_hbox_new(FALSE, 5);
 	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5);
 	gtk_widget_show(hbox);
-	
+
 	pref_bg_picture = show_color_pref(hbox, FALSE);
 	button = gaim_button(_("Background Color"), &font_options, OPT_FONT_BGCOL, hbox);
 
@@ -863,7 +868,8 @@
 	gtk_widget_show(select);
 
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), select);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(update_color), pref_bg_picture);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(update_color),
+			   pref_bg_picture);
 
 	sep = gtk_hseparator_new();
 	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
@@ -900,7 +906,7 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
@@ -918,11 +924,11 @@
 static GtkWidget *sndent[NUM_SOUNDS];
 static GtkWidget *sndcmd = NULL;
 
-void close_sounddialog(GtkWidget *w, GtkWidget *w2) 
+void close_sounddialog(GtkWidget *w, GtkWidget *w2)
 {
 
 	GtkWidget *dest;
-	
+
 	if (!GTK_IS_WIDGET(w2))
 		dest = w;
 	else
@@ -933,10 +939,11 @@
 	gtk_widget_destroy(dest);
 }
 
-void do_select_sound(GtkWidget *w, int snd) {
-	
+void do_select_sound(GtkWidget *w, int snd)
+{
+
 	char *file;
-	
+
 	file = gtk_file_selection_get_filename(GTK_FILE_SELECTION(sounddialog));
 
 	/* If they type in a directory, change there */
@@ -954,41 +961,42 @@
 
 	/* Set our text entry */
 	gtk_entry_set_text(GTK_ENTRY(sndent[snd]), sound_file[snd]);
-	
+
 	/* Close the window! It's getting cold in here! */
 	close_sounddialog(NULL, sounddialog);
 }
 
-static void reset_sound(GtkWidget *button, int snd) {
+static void reset_sound(GtkWidget *button, int snd)
+{
 
 	/* This just resets a sound file back to default */
 	sound_file[snd] = NULL;
-	
+
 	gtk_entry_set_text(GTK_ENTRY(sndent[snd]), "(default)");
 }
 
-static void sel_sound(GtkWidget *button, int snd) {
-	
+static void sel_sound(GtkWidget *button, int snd)
+{
+
 	char *buf = g_malloc(BUF_LEN);
-	
-	if (!sounddialog)
-	{
+
+	if (!sounddialog) {
 		sounddialog = gtk_file_selection_new(_("Gaim - Sound Configuration"));
 
 		gtk_file_selection_hide_fileop_buttons(GTK_FILE_SELECTION(sounddialog));
 
-		g_snprintf(buf, BUF_LEN -1, "%s/", getenv("HOME"));
+		g_snprintf(buf, BUF_LEN - 1, "%s/", getenv("HOME"));
 
 		gtk_file_selection_set_filename(GTK_FILE_SELECTION(sounddialog), buf);
 
-		gtk_signal_connect(GTK_OBJECT(sounddialog), "destroy", 
-				GTK_SIGNAL_FUNC(close_sounddialog), sounddialog);
+		gtk_signal_connect(GTK_OBJECT(sounddialog), "destroy",
+				   GTK_SIGNAL_FUNC(close_sounddialog), sounddialog);
 
 		gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(sounddialog)->ok_button),
-				"clicked", GTK_SIGNAL_FUNC(do_select_sound), (int *)snd);
+				   "clicked", GTK_SIGNAL_FUNC(do_select_sound), (int *)snd);
 
 		gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(sounddialog)->cancel_button),
-				"clicked", GTK_SIGNAL_FUNC(close_sounddialog), sounddialog);
+				   "clicked", GTK_SIGNAL_FUNC(close_sounddialog), sounddialog);
 	}
 
 	g_free(buf);
@@ -996,7 +1004,8 @@
 	gdk_window_raise(sounddialog->window);
 }
 
-static void sound_entry(char *label, int opt, GtkWidget *box, int snd) {
+static void sound_entry(char *label, int opt, GtkWidget *box, int snd)
+{
 	GtkWidget *hbox;
 	GtkWidget *entry;
 	GtkWidget *button;
@@ -1019,7 +1028,7 @@
 
 	entry = gtk_entry_new();
 	gtk_entry_set_editable(GTK_ENTRY(entry), FALSE);
-	
+
 	if (sound_file[snd])
 		gtk_entry_set_text(GTK_ENTRY(entry), sound_file[snd]);
 	else
@@ -1030,7 +1039,7 @@
 	gtk_widget_show(entry);
 }
 
-static gint sound_cmd_yeah(GtkEntry *entry, GdkEvent *event, gpointer d)
+static gint sound_cmd_yeah(GtkEntry * entry, GdkEvent *event, gpointer d)
 {
 	g_snprintf(sound_cmd, sizeof(sound_cmd), "%s", gtk_entry_get_text(GTK_ENTRY(sndcmd)));
 	save_prefs();
@@ -1052,7 +1061,7 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
@@ -1111,15 +1120,15 @@
 {
 	gchar buffer[2048];
 	guint text_len;
-	
+
 	cur_message = a;
-	
+
 	/* Get proper Length */
 	text_len = gtk_text_get_length(GTK_TEXT(away_text));
-	
+
 	/* Clear the Box */
-	gtk_text_set_point(GTK_TEXT(away_text), 0 );
-	gtk_text_forward_delete (GTK_TEXT(away_text), text_len);
+	gtk_text_set_point(GTK_TEXT(away_text), 0);
+	gtk_text_forward_delete(GTK_TEXT(away_text), text_len);
 
 	/* Fill the text box with new message */
 	strcpy(buffer, a->message);
@@ -1136,16 +1145,17 @@
 
 void remove_away_message(GtkWidget *widget, void *dummy)
 {
-        GList *i;
-        struct away_message *a;
+	GList *i;
+	struct away_message *a;
 
-        i = GTK_LIST(prefs_away_list)->selection;
+	i = GTK_LIST(prefs_away_list)->selection;
 
-	if (!i) return;
+	if (!i)
+		return;
 	if (!i->next) {
 		int text_len = gtk_text_get_length(GTK_TEXT(away_text));
-		gtk_text_set_point(GTK_TEXT(away_text), 0 );
-		gtk_text_forward_delete (GTK_TEXT(away_text), text_len);
+		gtk_text_set_point(GTK_TEXT(away_text), 0);
+		gtk_text_forward_delete(GTK_TEXT(away_text), text_len);
 	}
 	a = gtk_object_get_user_data(GTK_OBJECT(i->data));
 	rem_away_mess(NULL, a);
@@ -1176,7 +1186,7 @@
 	if (away_messages == NULL)
 		default_away = 0;
 	else if ((int)i >= length)
-		default_away = length-1;
+		default_away = length - 1;
 	else
 		default_away = (int)i;
 }
@@ -1193,7 +1203,8 @@
 	while (awy) {
 		a = (struct away_message *)awy->data;
 		opt = gtk_menu_item_new_with_label(a->name);
-		gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_default_away), (gpointer)index);
+		gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(set_default_away),
+				   (gpointer)index);
 		gtk_widget_show(opt);
 		gtk_menu_append(GTK_MENU(menu), opt);
 
@@ -1206,7 +1217,7 @@
 	gtk_option_menu_set_history(GTK_OPTION_MENU(omenu), default_away);
 }
 
-	
+
 
 static void away_page()
 {
@@ -1235,7 +1246,7 @@
 
 	box = gtk_vbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_widget_show(box);
 
 	hbox = gtk_hbox_new(TRUE, 0);
@@ -1256,7 +1267,7 @@
 
 	sw = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+				       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_box_pack_start(GTK_BOX(top), sw, TRUE, TRUE, 0);
 	gtk_widget_set_usize(sw, -1, 225);
 	gtk_widget_show(sw);
@@ -1268,7 +1279,7 @@
 
 	sw2 = gtk_scrolled_window_new(NULL, NULL);
 	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw2),
-			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+				       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_box_pack_start(GTK_BOX(top), sw2, TRUE, TRUE, 0);
 	gtk_widget_show(sw2);
 
@@ -1289,7 +1300,7 @@
 	button = picture_button(prefs, _("Edit"), save_xpm);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_away_mess), button);
 	gtk_box_pack_start(GTK_BOX(bot), button, TRUE, FALSE, 5);
-	
+
 	button = picture_button(prefs, _("Make Away"), gnome_preferences_xpm);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(do_away_mess), NULL);
 	gtk_box_pack_start(GTK_BOX(bot), button, TRUE, FALSE, 5);
@@ -1308,17 +1319,18 @@
 		a = (struct away_message *)awy->data;
 		label = gtk_label_new(a->name);
 		list_item = gtk_list_item_new();
-                gtk_container_add(GTK_CONTAINER(list_item), label);
-                gtk_signal_connect(GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(away_list_clicked), a);
+		gtk_container_add(GTK_CONTAINER(list_item), label);
+		gtk_signal_connect(GTK_OBJECT(list_item), "select", GTK_SIGNAL_FUNC(away_list_clicked),
+				   a);
 /*                gtk_signal_connect(GTK_OBJECT(list_item), "deselect", GTK_SIGNAL_FUNC(away_list_unclicked), a);*/
-                gtk_object_set_user_data(GTK_OBJECT(list_item), a);
+		gtk_object_set_user_data(GTK_OBJECT(list_item), a);
 
-                gtk_widget_show(label);
-                gtk_container_add(GTK_CONTAINER(prefs_away_list), list_item);
-                gtk_widget_show(list_item);
+		gtk_widget_show(label);
+		gtk_container_add(GTK_CONTAINER(prefs_away_list), list_item);
+		gtk_widget_show(list_item);
 
-                awy = awy->next;
-        }
+		awy = awy->next;
+	}
 
 	sep = gtk_hseparator_new();
 	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0);
@@ -1328,7 +1340,8 @@
 	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
 	gtk_widget_show(hbox);
 
-	gaim_button(_("Ignore new conversations when away   "), &general_options, OPT_GEN_DISCARD_WHEN_AWAY, hbox);
+	gaim_button(_("Ignore new conversations when away   "), &general_options,
+		    OPT_GEN_DISCARD_WHEN_AWAY, hbox);
 	gaim_button(_("Sounds while away"), &sound_options, OPT_SOUND_WHEN_AWAY, hbox);
 
 	sep = gtk_hseparator_new();
@@ -1348,7 +1361,8 @@
 		gtk_widget_set_sensitive(GTK_WIDGET(spin), FALSE);
 	gtk_box_pack_start(GTK_BOX(hbox), spin, FALSE, FALSE, 0);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), spin);
-	gtk_signal_connect(GTK_OBJECT(adjust), "value-changed", GTK_SIGNAL_FUNC(set_auto_away), GTK_WIDGET(spin));
+	gtk_signal_connect(GTK_OBJECT(adjust), "value-changed", GTK_SIGNAL_FUNC(set_auto_away),
+			   GTK_WIDGET(spin));
 	gtk_widget_show(spin);
 
 	label = gtk_label_new(_("minutes using"));
@@ -1360,7 +1374,8 @@
 	default_away_menu_init(prefs_away_menu);
 	if (!(general_options & OPT_GEN_AUTO_AWAY))
 		gtk_widget_set_sensitive(GTK_WIDGET(prefs_away_menu), FALSE);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), prefs_away_menu);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive),
+			   prefs_away_menu);
 	gtk_widget_show(prefs_away_menu);
 
 	gtk_widget_show(prefdialog);
@@ -1372,24 +1387,24 @@
 static void set_browser(GtkWidget *w, int *data)
 {
 	web_browser = (int)data;
-        if (web_browser != BROWSER_MANUAL) {
-                if (browser_entry)
-                        gtk_widget_set_sensitive(browser_entry, FALSE);
-        } else {
-                if (browser_entry)
-                        gtk_widget_set_sensitive(browser_entry, TRUE);
-        }
+	if (web_browser != BROWSER_MANUAL) {
+		if (browser_entry)
+			gtk_widget_set_sensitive(browser_entry, FALSE);
+	} else {
+		if (browser_entry)
+			gtk_widget_set_sensitive(browser_entry, TRUE);
+	}
 
-        if (web_browser != BROWSER_NETSCAPE) {
-                if (new_window)
-                        gtk_widget_set_sensitive(new_window, FALSE);
-        } else {
-                if (new_window)
-                        gtk_widget_set_sensitive(new_window, TRUE);
-        }
+	if (web_browser != BROWSER_NETSCAPE) {
+		if (new_window)
+			gtk_widget_set_sensitive(new_window, FALSE);
+	} else {
+		if (new_window)
+			gtk_widget_set_sensitive(new_window, TRUE);
+	}
 
 
-        save_prefs();
+	save_prefs();
 }
 
 static int manualentry_key_pressed(GtkWidget *w, GdkEvent *event, void *dummy)
@@ -1406,7 +1421,9 @@
 	if (!set)
 		opt = gtk_radio_button_new_with_label(NULL, label);
 	else
-		opt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(set)), label);
+		opt =
+		    gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(set)),
+						    label);
 	gtk_box_pack_start(GTK_BOX(box), opt, FALSE, FALSE, 0);
 	gtk_signal_connect(GTK_OBJECT(opt), "clicked", GTK_SIGNAL_FUNC(set_browser), (void *)which);
 	gtk_widget_show(opt);
@@ -1437,7 +1454,7 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
@@ -1455,23 +1472,25 @@
 	browser_entry = gtk_entry_new();
 	gtk_box_pack_start(GTK_BOX(box), browser_entry, FALSE, FALSE, 0);
 	gtk_entry_set_text(GTK_ENTRY(browser_entry), web_command);
-	gtk_signal_connect(GTK_OBJECT(browser_entry), "focus_out_event", GTK_SIGNAL_FUNC(manualentry_key_pressed), NULL);
+	gtk_signal_connect(GTK_OBJECT(browser_entry), "focus_out_event",
+			   GTK_SIGNAL_FUNC(manualentry_key_pressed), NULL);
 	gtk_signal_connect(GTK_OBJECT(browser_entry), "destroy", GTK_SIGNAL_FUNC(brentdes), NULL);
 	gtk_widget_show(browser_entry);
 
-	new_window = gaim_button(_("Pop up new window by default"), &general_options, OPT_GEN_BROWSER_POPUP, box);
+	new_window =
+	    gaim_button(_("Pop up new window by default"), &general_options, OPT_GEN_BROWSER_POPUP, box);
 
-        if (web_browser != BROWSER_MANUAL) {
-                gtk_widget_set_sensitive(browser_entry, FALSE);
-        } else {
-                gtk_widget_set_sensitive(browser_entry, TRUE);
-        }
+	if (web_browser != BROWSER_MANUAL) {
+		gtk_widget_set_sensitive(browser_entry, FALSE);
+	} else {
+		gtk_widget_set_sensitive(browser_entry, TRUE);
+	}
 
-        if (web_browser != BROWSER_NETSCAPE) {
-                gtk_widget_set_sensitive(new_window, FALSE);
-        } else {
-                gtk_widget_set_sensitive(new_window, TRUE);
-        }
+	if (web_browser != BROWSER_NETSCAPE) {
+		gtk_widget_set_sensitive(new_window, FALSE);
+	} else {
+		gtk_widget_set_sensitive(new_window, TRUE);
+	}
 
 	gtk_widget_show(prefdialog);
 }
@@ -1497,13 +1516,15 @@
 	if (!set)
 		opt = gtk_radio_button_new_with_label(NULL, label);
 	else
-		opt = gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(set)), label);
+		opt =
+		    gtk_radio_button_new_with_label(gtk_radio_button_group(GTK_RADIO_BUTTON(set)),
+						    label);
 	gtk_box_pack_start(GTK_BOX(box), opt, FALSE, FALSE, 0);
 	gtk_signal_connect(GTK_OBJECT(opt), "clicked", GTK_SIGNAL_FUNC(set_deny_mode), (void *)which);
 	gtk_widget_show(opt);
 	if (current_deny_gc->permdeny == which)
 		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(opt), TRUE);
-	
+
 	return opt;
 }
 
@@ -1595,8 +1616,7 @@
 	while (c) {
 		gc = (struct gaim_connection *)c->data;
 		opt = gtk_menu_item_new_with_label(gc->username);
-		gtk_signal_connect(GTK_OBJECT(opt), "activate",
-				   GTK_SIGNAL_FUNC(deny_gc_opt), gc);
+		gtk_signal_connect(GTK_OBJECT(opt), "activate", GTK_SIGNAL_FUNC(deny_gc_opt), gc);
 		gtk_widget_show(opt);
 		gtk_menu_append(GTK_MENU(menu), opt);
 		if (gc == current_deny_gc)
@@ -1667,8 +1687,8 @@
 	GtkWidget *bbox;
 	GtkWidget *button;
 
-	current_deny_gc = connections->data; /* this is safe because this screen will only be
-						available when there are connections */
+	current_deny_gc = connections->data;	/* this is safe because this screen will only be
+						   available when there are connections */
 	current_is_deny = TRUE;
 
 	parent = prefdialog->parent;
@@ -1678,7 +1698,7 @@
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
-        gtk_container_set_border_width(GTK_CONTAINER(box), 5);
+	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_container_add(GTK_CONTAINER(prefdialog), box);
 	gtk_widget_show(box);
 
@@ -1696,8 +1716,7 @@
 
 	deny_opt_menu = gtk_option_menu_new();
 	gtk_box_pack_start(GTK_BOX(deny_conn_hbox), deny_opt_menu, FALSE, FALSE, 5);
-	gtk_signal_connect(GTK_OBJECT(deny_opt_menu), "destroy",
-			   GTK_SIGNAL_FUNC(des_deny_opt), NULL);
+	gtk_signal_connect(GTK_OBJECT(deny_opt_menu), "destroy", GTK_SIGNAL_FUNC(des_deny_opt), NULL);
 	gtk_widget_show(deny_opt_menu);
 
 	build_deny_menu();
@@ -1718,8 +1737,7 @@
 	gtk_widget_show(label);
 
 	sw = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-			GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 5);
 	gtk_widget_show(sw);
 
@@ -1753,8 +1771,7 @@
 	gtk_widget_show(label);
 
 	sw = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-			GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 	gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 5);
 	gtk_widget_show(sw);
 
@@ -1779,9 +1796,10 @@
 	gtk_widget_show(prefdialog);
 }
 
-void update_connection_dependent_prefs() /* what a crappy name */
-{
-	if (!prefs) return;
+void update_connection_dependent_prefs()
+{				/* what a crappy name */
+	if (!prefs)
+		return;
 	if (!connections && deny_node) {
 		if (current_is_deny)
 			gtk_ctree_select(GTK_CTREE(preftree), general_node);
@@ -1798,7 +1816,7 @@
 	}
 }
 
-static void try_me(GtkCTree *ctree, GtkCTreeNode *node)
+static void try_me(GtkCTree * ctree, GtkCTreeNode * node)
 {
 	/* this is a hack */
 	void (*func)();
@@ -1826,8 +1844,7 @@
 	aol_icon(prefs->window);
 	gtk_window_set_title(GTK_WINDOW(prefs), _("Gaim - Preferences"));
 	gtk_widget_set_usize(prefs, 690, 540);
-	gtk_signal_connect(GTK_OBJECT(prefs), "destroy",
-			   GTK_SIGNAL_FUNC(delete_prefs), NULL);
+	gtk_signal_connect(GTK_OBJECT(prefs), "destroy", GTK_SIGNAL_FUNC(delete_prefs), NULL);
 
 	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_container_border_width(GTK_CONTAINER(vbox), 5);
@@ -1837,17 +1854,16 @@
 	hpaned = gtk_hpaned_new();
 	gtk_box_pack_start(GTK_BOX(vbox), hpaned, TRUE, TRUE, 0);
 	gtk_widget_show(hpaned);
-	
-       	scroll = gtk_scrolled_window_new(NULL, NULL);
+
+	scroll = gtk_scrolled_window_new(NULL, NULL);
 	gtk_paned_pack1(GTK_PANED(hpaned), scroll, FALSE, FALSE);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
-			GTK_POLICY_NEVER, GTK_POLICY_NEVER);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
 	gtk_widget_set_usize(scroll, 125, -1);
 	gtk_widget_show(scroll);
 
 	preftree = gtk_ctree_new(1, 0);
-	gtk_ctree_set_line_style (GTK_CTREE(preftree), GTK_CTREE_LINES_SOLID);
-        gtk_ctree_set_expander_style(GTK_CTREE(preftree), GTK_CTREE_EXPANDER_TRIANGLE);
+	gtk_ctree_set_line_style(GTK_CTREE(preftree), GTK_CTREE_LINES_SOLID);
+	gtk_ctree_set_expander_style(GTK_CTREE(preftree), GTK_CTREE_EXPANDER_TRIANGLE);
 	gtk_clist_set_reorderable(GTK_CLIST(preftree), FALSE);
 	gtk_container_add(GTK_CONTAINER(scroll), preftree);
 	gtk_signal_connect(GTK_OBJECT(preftree), "tree_select_row", GTK_SIGNAL_FUNC(try_me), NULL);
@@ -1888,14 +1904,13 @@
 {
 	if (debugbutton)
 		gtk_button_clicked(GTK_BUTTON(debugbutton));
-        if (general_options & OPT_GEN_DEBUG)
-        {
-                general_options = general_options ^ (int)OPT_GEN_DEBUG;
-                save_prefs();
-        }
-        g_free(dw);
-        dw=NULL;
-        return FALSE;
+	if (general_options & OPT_GEN_DEBUG) {
+		general_options = general_options ^ (int)OPT_GEN_DEBUG;
+		save_prefs();
+	}
+	g_free(dw);
+	dw = NULL;
+	return FALSE;
 
 }
 
@@ -1906,34 +1921,34 @@
 	if (!dw)
 		dw = g_new0(struct debug_window, 1);
 
-	box = gtk_hbox_new(FALSE,0);
+	box = gtk_hbox_new(FALSE, 0);
 	dw->window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_window_set_title(GTK_WINDOW(dw->window), _("GAIM debug output window"));
-	gtk_window_set_wmclass(GTK_WINDOW(dw->window),
-                               "debug_out", "Gaim");
+	gtk_window_set_wmclass(GTK_WINDOW(dw->window), "debug_out", "Gaim");
 	gtk_container_add(GTK_CONTAINER(dw->window), box);
-	dw->entry = gtk_text_new(NULL,NULL);
+	dw->entry = gtk_text_new(NULL, NULL);
 	gtk_widget_set_usize(dw->entry, 500, 200);
 	scroll = gtk_vscrollbar_new(GTK_TEXT(dw->entry)->vadj);
-	gtk_box_pack_start(GTK_BOX(box), dw->entry, TRUE,TRUE,0);
-	gtk_box_pack_end(GTK_BOX(box), scroll,FALSE,FALSE,0);
+	gtk_box_pack_start(GTK_BOX(box), dw->entry, TRUE, TRUE, 0);
+	gtk_box_pack_end(GTK_BOX(box), scroll, FALSE, FALSE, 0);
 	gtk_widget_show(dw->entry);
 	gtk_widget_show(scroll);
 	gtk_widget_show(box);
-	gtk_signal_connect(GTK_OBJECT(dw->window),"delete_event", GTK_SIGNAL_FUNC(debug_delete), NULL);
+	gtk_signal_connect(GTK_OBJECT(dw->window), "delete_event", GTK_SIGNAL_FUNC(debug_delete), NULL);
 	gtk_widget_show(dw->window);
 }
 
-void show_debug(GtkObject *obj)
+void show_debug(GtkObject * obj)
 {
-	if((general_options & OPT_GEN_DEBUG)) {
-                if(!dw || !dw->window)
-                        build_debug();
-                gtk_widget_show(dw->window);
-        } else {
-		if (!dw) return;
-                gtk_widget_destroy(dw->window);
-                dw->window = NULL;
+	if ((general_options & OPT_GEN_DEBUG)) {
+		if (!dw || !dw->window)
+			build_debug();
+		gtk_widget_show(dw->window);
+	} else {
+		if (!dw)
+			return;
+		gtk_widget_destroy(dw->window);
+		dw->window = NULL;
 	}
 }
 
@@ -1949,7 +1964,7 @@
 
 		gtk_text_insert(GTK_TEXT(dw->entry), NULL, NULL, NULL, s, -1);
 #ifdef DEBUG
-        printf("%s", chars);
+		printf("%s", chars);
 #endif
 		g_free(s);
 	}
@@ -1969,8 +1984,8 @@
 	prefdialog = NULL;
 	debugbutton = NULL;
 	prefs_away_menu = NULL;
-	
-        return FALSE;
+
+	return FALSE;
 }
 
 static void delete_prefs(GtkWidget *w, void *data)
@@ -1984,7 +1999,7 @@
 	deny_node = NULL;
 	current_deny_gc = NULL;
 }
-      
+
 
 void set_option(GtkWidget *w, int *option)
 {
@@ -1995,8 +2010,8 @@
 {
 	general_options = general_options ^ (int)option;
 
-       	if ((int)option == OPT_GEN_LOG_ALL)
-       		update_log_convs();
+	if ((int)option == OPT_GEN_LOG_ALL)
+		update_log_convs();
 
 	if ((int)option == OPT_GEN_CHECK_SPELLING)
 		toggle_spellchk();
@@ -2006,7 +2021,7 @@
 
 void set_display_option(GtkWidget *w, int *option)
 {
-        display_options = display_options ^ (int)option;
+	display_options = display_options ^ (int)option;
 
 	if (blist && ((int)option == OPT_DISP_NO_BUTTONS))
 		build_imchat_box(!(display_options & OPT_DISP_NO_BUTTONS));
@@ -2034,7 +2049,7 @@
 {
 	font_options = font_options ^ (int)option;
 
-	update_font_buttons();	
+	update_font_buttons();
 
 	save_prefs();
 }
@@ -2047,15 +2062,19 @@
 	gtk_box_pack_start(GTK_BOX(page), button, FALSE, FALSE, 0);
 
 	if (options == &font_options)
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_font_option), (int *)option);
+		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_font_option),
+				   (int *)option);
 
 	if (options == &sound_options)
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_sound_option), (int *)option);
+		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_sound_option),
+				   (int *)option);
 	if (options == &display_options)
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_display_option), (int *)option);
+		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_display_option),
+				   (int *)option);
 
 	if (options == &general_options)
-		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_general_option), (int *)option);
+		gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(set_general_option),
+				   (int *)option);
 	gtk_widget_show(button);
 
 	return button;
@@ -2067,7 +2086,7 @@
 
 	text[0] = _("General");
 	general_node = gtk_ctree_insert_node(GTK_CTREE(preftree), NULL, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 0, 1);
+					     text, 5, NULL, NULL, NULL, NULL, 0, 1);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), general_node, general_page);
 
 	gtk_ctree_select(GTK_CTREE(preftree), general_node);
@@ -2080,7 +2099,7 @@
 
 	text[0] = _("Buddy List");
 	parent = gtk_ctree_insert_node(GTK_CTREE(preftree), NULL, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 0, 1);
+				       text, 5, NULL, NULL, NULL, NULL, 0, 1);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), parent, buddy_page);
 }
 
@@ -2091,27 +2110,27 @@
 
 	text[0] = _("Conversations");
 	parent = gtk_ctree_insert_node(GTK_CTREE(preftree), NULL, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 0, 1);
+				       text, 5, NULL, NULL, NULL, NULL, 0, 1);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), parent, convo_page);
 
 	text[0] = _("IM Window");
 	node = gtk_ctree_insert_node(GTK_CTREE(preftree), parent, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 0, 1);
+				     text, 5, NULL, NULL, NULL, NULL, 0, 1);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node, im_page);
 
 	text[0] = _("Chat Window");
 	node = gtk_ctree_insert_node(GTK_CTREE(preftree), parent, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 0, 1);
+				     text, 5, NULL, NULL, NULL, NULL, 0, 1);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node, chat_page);
 
 	text[0] = _("Chat Rooms");
 	node2 = gtk_ctree_insert_node(GTK_CTREE(preftree), node, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 1, 0);
+				      text, 5, NULL, NULL, NULL, NULL, 1, 0);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node2, room_page);
 
 	text[0] = _("Font Options");
 	node = gtk_ctree_insert_node(GTK_CTREE(preftree), parent, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 0, 1);
+				     text, 5, NULL, NULL, NULL, NULL, 0, 1);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node, font_page);
 }
 
@@ -2122,12 +2141,12 @@
 
 	text[0] = _("Sounds");
 	parent = gtk_ctree_insert_node(GTK_CTREE(preftree), NULL, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 0, 1);
+				       text, 5, NULL, NULL, NULL, NULL, 0, 1);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), parent, sound_page);
 
 	text[0] = _("Events");
 	node = gtk_ctree_insert_node(GTK_CTREE(preftree), parent, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 0, 1);
+				     text, 5, NULL, NULL, NULL, NULL, 0, 1);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node, event_page);
 }
 
@@ -2138,7 +2157,7 @@
 
 	text[0] = _("Away Messages");
 	parent = gtk_ctree_insert_node(GTK_CTREE(preftree), NULL, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 0, 1);
+				       text, 5, NULL, NULL, NULL, NULL, 0, 1);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), parent, away_page);
 }
 
@@ -2149,7 +2168,7 @@
 
 	text[0] = _("Browser");
 	parent = gtk_ctree_insert_node(GTK_CTREE(preftree), NULL, NULL,
-					text, 5, NULL, NULL, NULL, NULL, 0, 1);
+				       text, 5, NULL, NULL, NULL, NULL, 0, 1);
 	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), parent, browser_page);
 }
 
@@ -2160,7 +2179,7 @@
 	if (connections && !deny_node) {
 		text[0] = _("Privacy");
 		deny_node = gtk_ctree_insert_node(GTK_CTREE(preftree), NULL, NULL,
-						text, 5, NULL, NULL, NULL, NULL, 0, 1);
+						  text, 5, NULL, NULL, NULL, NULL, 0, 1);
 		gtk_ctree_node_set_row_data(GTK_CTREE(preftree), deny_node, deny_page);
 	}
 }