# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 988636362 0
# Node ID d7cbedd1d6516d3c7423346ca5a82d6f246d9d82
# Parent  0da2a831c0ae4c665e13ae1ba065d893f65c615d
[gaim-migrate @ 1790]
woo. more preferences redesigns. also gtk_imhtml_clear and gaim_setup_imhtml. this is knee-toe.

committer: Tailor Script <tailor@pidgin.im>

diff -r 0da2a831c0ae -r d7cbedd1d651 src/buddy_chat.c
--- a/src/buddy_chat.c	Mon Apr 30 11:54:59 2001 +0000
+++ b/src/buddy_chat.c	Mon Apr 30 13:12:42 2001 +0000
@@ -39,10 +39,6 @@
 #include "pixmaps/join.xpm"
 #include "pixmaps/close.xpm"
 
-#include "pixmaps/luke03.xpm"
-#include "pixmaps/oneeye.xpm"
-#include "pixmaps/crazy4.xpm"
-
 static GtkWidget *joinchat;
 static struct gaim_connection *joinchatgc;
 static GtkWidget *entry;
@@ -845,16 +841,9 @@
 	gtk_container_add(GTK_CONTAINER(sw), text);
 	GTK_LAYOUT(text)->hadjustment->step_increment = 10.0;
 	GTK_LAYOUT(text)->vadjustment->step_increment = 10.0;
-	if (!(display_options & OPT_DISP_SHOW_SMILEY))
-		gtk_imhtml_show_smileys(GTK_IMHTML(text), FALSE);
 	if (display_options & OPT_DISP_SHOW_TIME)
 		gtk_imhtml_show_comments(GTK_IMHTML(text), TRUE);
-	gtk_signal_connect(GTK_OBJECT(text), "url_clicked", GTK_SIGNAL_FUNC(open_url_nw), NULL);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), "C:)", luke03_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), "C:-)", luke03_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), "O-)", oneeye_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), ">:)", crazy4_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), ">:-)", crazy4_xpm);
+	gaim_setup_imhtml(GTK_IMHTML(text));
 	gtk_widget_show(text);
 
 	lbox = gtk_vbox_new(FALSE, 5);
diff -r 0da2a831c0ae -r d7cbedd1d651 src/conversation.c
--- a/src/conversation.c	Mon Apr 30 11:54:59 2001 +0000
+++ b/src/conversation.c	Mon Apr 30 13:12:42 2001 +0000
@@ -78,6 +78,18 @@
 /*------------------------------------------------------------------------*/
 
 
+void gaim_setup_imhtml(GtkIMHtml *imhtml)
+{
+	if (!(display_options & OPT_DISP_SHOW_SMILEY))
+		gtk_imhtml_show_smileys(GTK_IMHTML(imhtml), FALSE);
+	gtk_signal_connect(GTK_OBJECT(imhtml), "url_clicked", GTK_SIGNAL_FUNC(open_url_nw), NULL);
+	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), "C:)", luke03_xpm);
+	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), "C:-)", luke03_xpm);
+	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), "O-)", oneeye_xpm);
+	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), ">:)", crazy4_xpm);
+	gtk_imhtml_associate_smiley(GTK_IMHTML(imhtml), ">:-)", crazy4_xpm);
+}
+
 void quiet_set(GtkWidget *tb, int state)
 {
 	state_lock = 1;
@@ -2044,16 +2056,9 @@
 	gtk_container_add(GTK_CONTAINER(sw), text);
 	GTK_LAYOUT(text)->hadjustment->step_increment = 10.0;
 	GTK_LAYOUT(text)->vadjustment->step_increment = 10.0;
-	if (!(display_options & OPT_DISP_SHOW_SMILEY))
-		gtk_imhtml_show_smileys(GTK_IMHTML(text), FALSE);
 	if (display_options & OPT_DISP_SHOW_TIME)
 		gtk_imhtml_show_comments(GTK_IMHTML(text), TRUE);
-	gtk_signal_connect(GTK_OBJECT(text), "url_clicked", GTK_SIGNAL_FUNC(open_url_nw), NULL);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), "C:)", luke03_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), "C:-)", luke03_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), "O-)", oneeye_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), ">:)", crazy4_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), ">:-)", crazy4_xpm);
+	gaim_setup_imhtml(GTK_IMHTML(text));
 	gtk_widget_show(text);
 
 	vbox2 = gtk_vbox_new(FALSE, 5);
diff -r 0da2a831c0ae -r d7cbedd1d651 src/dialogs.c
--- a/src/dialogs.c	Mon Apr 30 11:54:59 2001 +0000
+++ b/src/dialogs.c	Mon Apr 30 13:12:42 2001 +0000
@@ -58,9 +58,7 @@
 #include "pixmaps/cry.xpm"
 #include "pixmaps/embarrassed.xpm"
 #include "pixmaps/kiss.xpm"
-#include "pixmaps/luke03.xpm"
 #include "pixmaps/moneymouth.xpm"
-#include "pixmaps/oneeye.xpm"
 #include "pixmaps/sad.xpm"
 #include "pixmaps/scream.xpm"
 #include "pixmaps/smile.xpm"
@@ -69,7 +67,6 @@
 #include "pixmaps/tongue.xpm"
 #include "pixmaps/wink.xpm"
 #include "pixmaps/yell.xpm"
-#include "pixmaps/crazy4.xpm"
 
 #include "pixmaps/aol_icon.xpm"
 #include "pixmaps/free_icon.xpm"
@@ -1757,14 +1754,7 @@
 	GTK_LAYOUT(text)->vadjustment->step_increment = 10.0;
 	gtk_widget_set_usize(sw, 300, 250);
 	gtk_imhtml_set_img_handler(GTK_IMHTML(text), info_img_handler);
-	if (!(display_options & OPT_DISP_SHOW_SMILEY))
-		gtk_imhtml_show_smileys(GTK_IMHTML(b->text), FALSE);
-	gtk_signal_connect(GTK_OBJECT(text), "url_clicked", GTK_SIGNAL_FUNC(open_url_nw), NULL);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), "C:)", luke03_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), "C:-)", luke03_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), "O-)", oneeye_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), ">:)", crazy4_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(text), ">:-)", crazy4_xpm);
+	gaim_setup_imhtml(GTK_IMHTML(text));
 
 	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(bbox), sw, TRUE, TRUE, 0);
@@ -3720,13 +3710,7 @@
 	layout = gtk_imhtml_new(NULL, NULL);
 	gtk_signal_connect(GTK_OBJECT(layout), "url_clicked", open_url_nw, NULL);
 	gtk_container_add(GTK_CONTAINER(sw), layout);
-	if (!(display_options & OPT_DISP_SHOW_SMILEY))
-		gtk_imhtml_show_smileys(GTK_IMHTML(layout), FALSE);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(layout), "C:)", luke03_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(layout), "C:-)", luke03_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(layout), "O-)", oneeye_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(layout), ">:)", crazy4_xpm);
-	gtk_imhtml_associate_smiley(GTK_IMHTML(layout), ">:-)", crazy4_xpm);
+	gaim_setup_imhtml(GTK_IMHTML(layout));
 
 	hbox = gtk_hbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
diff -r 0da2a831c0ae -r d7cbedd1d651 src/gtkimhtml.c
--- a/src/gtkimhtml.c	Mon Apr 30 11:54:59 2001 +0000
+++ b/src/gtkimhtml.c	Mon Apr 30 13:12:42 2001 +0000
@@ -179,6 +179,16 @@
 	if (imhtml->selected_text)
 		g_string_free (imhtml->selected_text, TRUE);
 
+	if (imhtml->tip_timer) {
+		gtk_timeout_remove (imhtml->tip_timer);
+		imhtml->tip_timer = 0;
+	}
+	if (imhtml->tip_window) {
+		gtk_widget_destroy (imhtml->tip_window);
+		imhtml->tip_window = NULL;
+	}
+	imhtml->tip_bit = NULL;
+
 	gdk_font_unref (imhtml->default_font);
 	gdk_color_free (imhtml->default_fg_color);
 	gdk_color_free (imhtml->default_bg_color);
@@ -2990,3 +3000,70 @@
 
 	return retval;
 }
+
+void
+gtk_imhtml_clear (GtkIMHtml *imhtml)
+{
+	g_return_if_fail (imhtml != NULL);
+	g_return_if_fail (GTK_IS_IMHTML (imhtml));
+
+	while (imhtml->bits) {
+		GtkIMHtmlBit *bit = imhtml->bits->data;
+		imhtml->bits = g_list_remove (imhtml->bits, bit);
+		if (bit->text)
+			g_free (bit->text);
+		if (bit->font)
+			gdk_font_unref (bit->font);
+		if (bit->fore)
+			gdk_color_free (bit->fore);
+		if (bit->back)
+			gdk_color_free (bit->back);
+		if (bit->bg)
+			gdk_color_free (bit->bg);
+		if (bit->url)
+			g_free (bit->url);
+		if (bit->pm)
+			gdk_pixmap_unref (bit->pm);
+		if (bit->bm)
+			gdk_bitmap_unref (bit->bm);
+		while (bit->chunks) {
+			struct line_info *li = bit->chunks->data;
+			if (li->text)
+				g_free (li->text);
+			bit->chunks = g_list_remove (bit->chunks, li);
+			g_free (li);
+		}
+		g_free (bit);
+	}
+
+	while (imhtml->urls) {
+		g_free (imhtml->urls->data);
+		imhtml->urls = g_list_remove (imhtml->urls, imhtml->urls->data);
+	}
+
+	if (imhtml->selected_text) {
+		g_string_free (imhtml->selected_text, TRUE);
+		imhtml->selected_text = g_string_new ("");
+	}
+
+	if (imhtml->tip_timer) {
+		gtk_timeout_remove (imhtml->tip_timer);
+		imhtml->tip_timer = 0;
+	}
+	if (imhtml->tip_window) {
+		gtk_widget_destroy (imhtml->tip_window);
+		imhtml->tip_window = NULL;
+	}
+	imhtml->tip_bit = NULL;
+
+	gdk_window_set_cursor (GTK_LAYOUT (imhtml)->bin_window, imhtml->arrow_cursor);
+
+	imhtml->x = BORDER_SIZE;
+	imhtml->y = BORDER_SIZE + 10;
+	imhtml->llheight = 0;
+	imhtml->llascent = 0;
+	imhtml->line = NULL;
+
+	if (GTK_WIDGET_REALIZED (GTK_WIDGET (imhtml)))
+		gdk_window_clear (GTK_LAYOUT (imhtml)->bin_window);
+}
diff -r 0da2a831c0ae -r d7cbedd1d651 src/gtkimhtml.h
--- a/src/gtkimhtml.h	Mon Apr 30 11:54:59 2001 +0000
+++ b/src/gtkimhtml.h	Mon Apr 30 13:12:42 2001 +0000
@@ -127,6 +127,8 @@
 					const gchar      *text,
 					GtkIMHtmlOptions  options);
 
+void       gtk_imhtml_clear            (GtkIMHtml        *imhtml);
+
 #ifdef __cplusplus
 }
 #endif
diff -r 0da2a831c0ae -r d7cbedd1d651 src/prefs.c
--- a/src/prefs.c	Mon Apr 30 11:54:59 2001 +0000
+++ b/src/prefs.c	Mon Apr 30 13:12:42 2001 +0000
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <gtk/gtk.h>
+#include "gtkimhtml.h"
 #include "gaim.h"
 #include "prpl.h"
 #include "pixmaps/cancel.xpm"
@@ -317,7 +318,11 @@
 	GtkWidget *parent;
 	GtkWidget *box;
 	GtkWidget *label;
-	GtkWidget *sep;
+	GtkWidget *frame;
+	GtkWidget *hbox;
+	GtkWidget *vbox;
+	GtkWidget *button;
+	GtkWidget *button2;
 
 	parent = prefdialog->parent;
 	gtk_widget_destroy(prefdialog);
@@ -334,34 +339,77 @@
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
 	gtk_widget_show(label);
 
-	gaim_button(_("Save Window Size/Position"), &general_options, OPT_GEN_SAVED_WINDOWS, box);
+	frame = gtk_frame_new(_("Buddy List Window"));
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
+	gtk_widget_show(frame);
+
+	hbox = gtk_hbox_new(TRUE, 5);
+	gtk_container_add(GTK_CONTAINER(frame), hbox);
+	gtk_widget_show(hbox);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
+	gtk_widget_show(vbox);
+
+	button = gaim_button(_("Hide IM/Info/Chat buttons"), &display_options, OPT_DISP_NO_BUTTONS, vbox);
 #ifdef USE_APPLET
 	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);
+		    OPT_GEN_APP_BUDDY_SHOW, vbox);
+#endif
+	gaim_button(_("Save Window Size/Position"), &general_options, OPT_GEN_SAVED_WINDOWS, vbox);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
+	gtk_widget_show(vbox);
+
+	button2 = gaim_button(_("Show pictures on buttons"), &display_options, OPT_DISP_SHOW_BUTTON_XPM, vbox);
+	if (display_options & OPT_DISP_NO_BUTTONS)
+		gtk_widget_set_sensitive(button2, FALSE);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), button2);
+#ifdef USE_APPLET
+	gaim_button(_("Display Buddy List near applet"), &general_options, OPT_GEN_NEAR_APPLET, vbox);
 #endif
 
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-	gtk_widget_show(sep);
-
-	gaim_button(_("Hide groups with no online buddies"), &display_options, OPT_DISP_NO_MT_GRP, box);
-	gaim_button(_("Show numbers in groups"), &display_options, OPT_DISP_SHOW_GRPNUM, box);
-
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-	gtk_widget_show(sep);
-
-	gaim_button(_("Show buddy type icons"), &display_options, OPT_DISP_SHOW_PIXMAPS, box);
-	gaim_button(_("Show warning levels"), &display_options, OPT_DISP_SHOW_WARN, box);
-	gaim_button(_("Show idle times"), &display_options, OPT_DISP_SHOW_IDLETIME, box);
-
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-	gtk_widget_show(sep);
-
-	gaim_button(_("Hide IM/Info/Chat buttons"), &display_options, OPT_DISP_NO_BUTTONS, box);
-	gaim_button(_("Show pictures on buttons"), &display_options, OPT_DISP_SHOW_BUTTON_XPM, box);
+	frame = gtk_frame_new(_("Group Displays"));
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
+	gtk_widget_show(frame);
+
+	hbox = gtk_hbox_new(TRUE, 5);
+	gtk_container_add(GTK_CONTAINER(frame), hbox);
+	gtk_widget_show(hbox);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
+	gtk_widget_show(vbox);
+
+	gaim_button(_("Hide groups with no online buddies"), &display_options, OPT_DISP_NO_MT_GRP, vbox);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
+	gtk_widget_show(vbox);
+
+	gaim_button(_("Show numbers in groups"), &display_options, OPT_DISP_SHOW_GRPNUM, vbox);
+
+	frame = gtk_frame_new(_("Buddy Displays"));
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
+	gtk_widget_show(frame);
+
+	hbox = gtk_hbox_new(TRUE, 5);
+	gtk_container_add(GTK_CONTAINER(frame), hbox);
+	gtk_widget_show(hbox);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
+	gtk_widget_show(vbox);
+
+	gaim_button(_("Show buddy type icons"), &display_options, OPT_DISP_SHOW_PIXMAPS, vbox);
+	gaim_button(_("Show warning levels"), &display_options, OPT_DISP_SHOW_WARN, vbox);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
+	gtk_widget_show(vbox);
+
+	gaim_button(_("Show idle times"), &display_options, OPT_DISP_SHOW_IDLETIME, vbox);
 
 	gtk_widget_show(prefdialog);
 }
@@ -422,7 +470,7 @@
 	gtk_container_add(GTK_CONTAINER(frame), hbox);
 	gtk_widget_show(hbox);
 
-	vbox = gtk_vbox_new(TRUE, 5);
+	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
 	gtk_widget_show(vbox);
 
@@ -433,7 +481,7 @@
 	gaim_button(_("Sending messages removes away status"), &general_options, OPT_GEN_BACK_ON_IM, vbox);
 	gaim_button(_("Queue new messages when away"), &general_options, OPT_GEN_QUEUE_WHEN_AWAY, vbox);
 
-	vbox = gtk_vbox_new(TRUE, 5);
+	vbox = gtk_vbox_new(FALSE, 5);
 	gtk_box_pack_start(GTK_BOX(hbox), vbox, TRUE, TRUE, 5);
 	gtk_widget_show(vbox);
 
@@ -1180,34 +1228,6 @@
 	gtk_widget_show(prefdialog);
 }
 
-static void sound_page()
-{
-	GtkWidget *parent;
-	GtkWidget *box;
-	GtkWidget *label;
-
-	parent = prefdialog->parent;
-	gtk_widget_destroy(prefdialog);
-
-	prefdialog = gtk_frame_new(_("Sound Options"));
-	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
-
-	box = gtk_vbox_new(FALSE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
-	gtk_container_add(GTK_CONTAINER(prefdialog), box);
-	gtk_widget_show(box);
-
-	label = gtk_label_new(_("All options take effect immediately unless otherwise noted."));
-	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
-	gtk_widget_show(label);
-
-	gaim_button(_("No sounds when you log in"), &sound_options, OPT_SOUND_SILENT_SIGNON, box);
-	gaim_button(_("Sounds while away"), &sound_options, OPT_SOUND_WHEN_AWAY, box);
-	gaim_button(_("Beep instead of playing sound"), &sound_options, OPT_SOUND_BEEP, box);
-
-	gtk_widget_show(prefdialog);
-}
-
 static GtkWidget *sndent[NUM_SOUNDS];
 static GtkWidget *sndcmd = NULL;
 
@@ -1297,14 +1317,14 @@
 	GtkWidget *entry;
 	GtkWidget *button;
 
-	hbox = gtk_hbox_new(FALSE, 5);
+	hbox = gtk_hbox_new(FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
 	gtk_widget_show(hbox);
 
 	gaim_button(label, &sound_options, opt, hbox);
 
 	button = gtk_button_new_with_label(_("Reset"));
-	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(reset_sound), (void *)snd);
 	gtk_widget_show(button);
 
@@ -1321,7 +1341,7 @@
 	else
 		gtk_entry_set_text(GTK_ENTRY(entry), "(default)");
 
-	gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 0);
+	gtk_box_pack_end(GTK_BOX(hbox), entry, FALSE, FALSE, 5);
 	sndent[snd] = entry;
 	gtk_widget_show(entry);
 }
@@ -1333,18 +1353,21 @@
 	return TRUE;
 }
 
-static void event_page()
+static void sound_page()
 {
 	GtkWidget *parent;
 	GtkWidget *box;
 	GtkWidget *label;
+	GtkWidget *frame;
+	GtkWidget *vbox;
+	GtkWidget *hbox;
+	GtkWidget *vbox2;
 	GtkWidget *sep;
-	GtkWidget *hbox;
 
 	parent = prefdialog->parent;
 	gtk_widget_destroy(prefdialog);
 
-	prefdialog = gtk_frame_new(_("Sound Events"));
+	prefdialog = gtk_frame_new(_("Sound Options"));
 	gtk_container_add(GTK_CONTAINER(parent), prefdialog);
 
 	box = gtk_vbox_new(FALSE, 5);
@@ -1356,36 +1379,40 @@
 	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
 	gtk_widget_show(label);
 
-	sound_entry(_("Sound when buddy logs in"), OPT_SOUND_LOGIN, box, BUDDY_ARRIVE);
-	sound_entry(_("Sound when buddy logs out"), OPT_SOUND_LOGOUT, box, BUDDY_LEAVE);
-
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-	gtk_widget_show(sep);
-
-	sound_entry(_("Sound when message is received"), OPT_SOUND_RECV, box, RECEIVE);
-	sound_entry(_("Sound when message is first received"), OPT_SOUND_FIRST_RCV, box, FIRST_RECEIVE);
-	sound_entry(_("Sound when message is sent"), OPT_SOUND_SEND, box, SEND);
+	frame = gtk_frame_new(_("Options"));
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
+	gtk_widget_show(frame);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	gtk_widget_show(vbox);
+
+	hbox = gtk_hbox_new(TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
+	gtk_widget_show(hbox);
+
+	vbox2 = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 5);
+	gtk_widget_show(vbox2);
+
+	gaim_button(_("No sounds when you log in"), &sound_options, OPT_SOUND_SILENT_SIGNON, vbox2);
+	gaim_button(_("Sounds while away"), &sound_options, OPT_SOUND_WHEN_AWAY, vbox2);
+
+	vbox2 = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 5);
+	gtk_widget_show(vbox2);
+
+	gaim_button(_("Beep instead of playing sound"), &sound_options, OPT_SOUND_BEEP, vbox2);
 
 	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
 	gtk_widget_show(sep);
 
-	sound_entry(_("Sound in chat rooms when people enter"), OPT_SOUND_CHAT_JOIN, box, CHAT_JOIN);
-	sound_entry(_("Sound in chat rooms when people leave"), OPT_SOUND_CHAT_PART, box, CHAT_LEAVE);
-	sound_entry(_("Sound in chat rooms when you talk"), OPT_SOUND_CHAT_YOU_SAY, box, CHAT_YOU_SAY);
-	sound_entry(_("Sound in chat rooms when others talk"), OPT_SOUND_CHAT_SAY, box, CHAT_SAY);
-
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-	gtk_widget_show(sep);
-
-	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5);
+	hbox = gtk_hbox_new(TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
 	gtk_widget_show(hbox);
 
-	label = gtk_label_new(_("Command to play sound files (%s for filename; internal if empty)"));
-
+	label = gtk_label_new(_("Command to play sound files\n(%s for filename; internal if empty)"));
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
 	gtk_widget_show(label);
 
@@ -1396,6 +1423,34 @@
 	gtk_signal_connect(GTK_OBJECT(sndcmd), "focus_out_event", GTK_SIGNAL_FUNC(sound_cmd_yeah), NULL);
 	gtk_widget_show(sndcmd);
 
+	frame = gtk_frame_new(_("Events"));
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
+	gtk_widget_show(frame);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	gtk_widget_show(vbox);
+
+	sound_entry(_("Sound when buddy logs in"), OPT_SOUND_LOGIN, vbox, BUDDY_ARRIVE);
+	sound_entry(_("Sound when buddy logs out"), OPT_SOUND_LOGOUT, vbox, BUDDY_LEAVE);
+
+	sep = gtk_hseparator_new();
+	gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 5);
+	gtk_widget_show(sep);
+
+	sound_entry(_("Sound when received message begins conversation"), OPT_SOUND_FIRST_RCV, vbox, FIRST_RECEIVE);
+	sound_entry(_("Sound when message is received"), OPT_SOUND_RECV, vbox, RECEIVE);
+	sound_entry(_("Sound when message is sent"), OPT_SOUND_SEND, vbox, SEND);
+
+	sep = gtk_hseparator_new();
+	gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 5);
+	gtk_widget_show(sep);
+
+	sound_entry(_("Sound in chat rooms when people enter"), OPT_SOUND_CHAT_JOIN, vbox, CHAT_JOIN);
+	sound_entry(_("Sound in chat rooms when people leave"), OPT_SOUND_CHAT_PART, vbox, CHAT_LEAVE);
+	sound_entry(_("Sound in chat rooms when you talk"), OPT_SOUND_CHAT_YOU_SAY, vbox, CHAT_YOU_SAY);
+	sound_entry(_("Sound in chat rooms when others talk"), OPT_SOUND_CHAT_SAY, vbox, CHAT_SAY);
+
 	gtk_widget_show(prefdialog);
 }
 
@@ -1406,29 +1461,22 @@
 
 void away_list_clicked(GtkWidget *widget, struct away_message *a)
 {
-	gchar buffer[2048];
-	guint text_len;
+	gchar buffer[BUF_LONG];
+	char *tmp;
 
 	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_imhtml_clear(GTK_IMHTML(away_text));
 
 	/* Fill the text box with new message */
 	strcpy(buffer, a->message);
-	gtk_text_insert(GTK_TEXT(away_text), NULL, NULL, NULL, buffer, -1);
-}
-
-void save_away_message(GtkWidget *widget, void *dummy)
-{
-	/* grab the current message */
-	edited_message = gtk_editable_get_chars(GTK_EDITABLE(away_text), 0, -1);
-	strcpy(cur_message->message, edited_message);
-	save_prefs();
+	tmp = stylize(buffer, BUF_LONG);
+	gtk_imhtml_append_text(GTK_IMHTML(away_text), tmp, GTK_IMHTML_NO_TITLE |
+							   GTK_IMHTML_NO_COMMENTS |
+							   GTK_IMHTML_NO_NEWLINE |
+							   GTK_IMHTML_NO_SCROLL);
+	g_free(tmp);
 }
 
 void remove_away_message(GtkWidget *widget, void *dummy)
@@ -1441,9 +1489,7 @@
 	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_imhtml_clear(GTK_IMHTML(away_text));
 	}
 	a = gtk_object_get_user_data(GTK_OBJECT(i->data));
 	rem_away_mess(NULL, a);
@@ -1512,20 +1558,22 @@
 {
 	GtkWidget *parent;
 	GtkWidget *box;
+	GtkWidget *label;
+	GtkWidget *frame;
+	GtkWidget *vbox;
 	GtkWidget *hbox;
+	GtkWidget *vbox2;
 	GtkWidget *top;
 	GtkWidget *bot;
 	GtkWidget *sw;
 	GtkWidget *sw2;
 	GtkWidget *button;
-	GtkWidget *label;
 	GtkWidget *list_item;
 	GtkWidget *sep;
 	GtkObject *adjust;
 	GtkWidget *spin;
 	GSList *awy = away_messages;
 	struct away_message *a;
-	char buffer[BUF_LONG];
 
 	parent = prefdialog->parent;
 	gtk_widget_destroy(prefdialog);
@@ -1538,110 +1586,43 @@
 	gtk_container_set_border_width(GTK_CONTAINER(box), 5);
 	gtk_widget_show(box);
 
-	hbox = gtk_hbox_new(TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5);
-	gtk_widget_show(hbox);
-
-	label = gtk_label_new(_("Title"));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
-	gtk_widget_show(label);
-
-	label = gtk_label_new(_("Message"));
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+	label = gtk_label_new(_("All options take effect immediately unless otherwise noted."));
+	gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 5);
 	gtk_widget_show(label);
 
-	top = gtk_hbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(box), top, TRUE, TRUE, 0);
-	gtk_widget_show(top);
-
-	sw = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-				       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);
-
-	prefs_away_list = gtk_list_new();
-	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), prefs_away_list);
-	gtk_signal_connect(GTK_OBJECT(prefs_away_list), "destroy", GTK_SIGNAL_FUNC(paldest), 0);
-	gtk_widget_show(prefs_away_list);
-
-	sw2 = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw2),
-				       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_box_pack_start(GTK_BOX(top), sw2, TRUE, TRUE, 0);
-	gtk_widget_show(sw2);
-
-	away_text = gtk_text_new(NULL, NULL);
-	gtk_container_add(GTK_CONTAINER(sw2), away_text);
-	gtk_text_set_word_wrap(GTK_TEXT(away_text), TRUE);
-	gtk_text_set_editable(GTK_TEXT(away_text), FALSE);
-	gtk_widget_show(away_text);
-
-	bot = gtk_hbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(box), bot, FALSE, FALSE, 5);
-	gtk_widget_show(bot);
-
-	button = picture_button(prefs, _("Add"), gnome_add_xpm);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_away_mess), NULL);
-	gtk_box_pack_start(GTK_BOX(bot), button, TRUE, FALSE, 5);
-
-	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);
-
-	make_away_button = picture_button(prefs, _("Make Away"), gnome_preferences_xpm);
-	gtk_signal_connect(GTK_OBJECT(make_away_button), "clicked", GTK_SIGNAL_FUNC(do_away_mess), NULL);
-	gtk_box_pack_start(GTK_BOX(bot), make_away_button, TRUE, FALSE, 5);
-	if (!connections)
-		gtk_widget_set_sensitive(make_away_button, FALSE);
-
-	button = picture_button(prefs, _("Remove"), gnome_remove_xpm);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(remove_away_message), NULL);
-	gtk_box_pack_start(GTK_BOX(bot), button, TRUE, FALSE, 5);
-
-	if (awy != NULL) {
-		a = (struct away_message *)awy->data;
-		g_snprintf(buffer, sizeof(buffer), "%s", a->message);
-		gtk_text_insert(GTK_TEXT(away_text), NULL, NULL, NULL, buffer, -1);
-	}
-
-	while (awy) {
-		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_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_widget_show(label);
-		gtk_container_add(GTK_CONTAINER(prefs_away_list), list_item);
-		gtk_widget_show(list_item);
-
-		awy = awy->next;
-	}
+	frame = gtk_frame_new(_("Options"));
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 5);
+	gtk_widget_show(frame);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	gtk_widget_show(vbox);
+
+	hbox = gtk_hbox_new(TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
+	gtk_widget_show(hbox);
+
+	vbox2 = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 5);
+	gtk_widget_show(vbox2);
+
+	gaim_button(_("Ignore new conversations when away"), &general_options, OPT_GEN_DISCARD_WHEN_AWAY, vbox2);
+	gaim_button(_("Sounds while away"), &sound_options, OPT_SOUND_WHEN_AWAY, vbox2);
+	gaim_button(_("Sending messages removes away status"), &general_options, OPT_GEN_BACK_ON_IM, vbox2);
+
+	vbox2 = gtk_vbox_new(FALSE, 5);
+	gtk_box_pack_start(GTK_BOX(hbox), vbox2, TRUE, TRUE, 5);
+	gtk_widget_show(vbox2);
+
+	gaim_button(_("Don't send auto-response"), &general_options, OPT_GEN_NO_AUTO_RESP, vbox2);
+	gaim_button(_("Queue new messages when away"), &general_options, OPT_GEN_QUEUE_WHEN_AWAY, vbox2);
 
 	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0);
-	gtk_widget_show(sep);
-
-	hbox = gtk_hbox_new(FALSE, 30);
-	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(_("Sounds while away"), &sound_options, OPT_SOUND_WHEN_AWAY, hbox);
-	gaim_button(_("Don't send auto-response"), &general_options, OPT_GEN_NO_AUTO_RESP, hbox);
-
-	sep = gtk_hseparator_new();
-	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
 	gtk_widget_show(sep);
 
 	hbox = gtk_hbox_new(FALSE, 5);
-	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	gtk_widget_show(hbox);
 
 	button = gaim_button(_("Auto Away after"), &general_options, OPT_GEN_AUTO_AWAY, hbox);
@@ -1670,6 +1651,105 @@
 			   prefs_away_menu);
 	gtk_widget_show(prefs_away_menu);
 
+	frame = gtk_frame_new(_("Messages"));
+	gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 5);
+	gtk_widget_show(frame);
+
+	vbox = gtk_vbox_new(FALSE, 5);
+	gtk_container_add(GTK_CONTAINER(frame), vbox);
+	gtk_widget_show(vbox);
+
+	hbox = gtk_hbox_new(TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
+	gtk_widget_show(hbox);
+
+	label = gtk_label_new(_("Title"));
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+	gtk_widget_show(label);
+
+	label = gtk_label_new(_("Message"));
+	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 5);
+	gtk_widget_show(label);
+
+	top = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), top, TRUE, TRUE, 0);
+	gtk_widget_show(top);
+
+	sw = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
+				       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);
+
+	prefs_away_list = gtk_list_new();
+	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), prefs_away_list);
+	gtk_signal_connect(GTK_OBJECT(prefs_away_list), "destroy", GTK_SIGNAL_FUNC(paldest), 0);
+	gtk_widget_show(prefs_away_list);
+
+	sw2 = gtk_scrolled_window_new(NULL, NULL);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw2),
+				       GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+	gtk_box_pack_start(GTK_BOX(top), sw2, TRUE, TRUE, 0);
+	gtk_widget_show(sw2);
+
+	away_text = gtk_imhtml_new(NULL, NULL);
+	gtk_container_add(GTK_CONTAINER(sw2), away_text);
+	gaim_setup_imhtml(GTK_IMHTML(away_text));
+	gtk_widget_show(away_text);
+
+	bot = gtk_hbox_new(FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), bot, FALSE, FALSE, 5);
+	gtk_widget_show(bot);
+
+	button = picture_button(prefs, _("Add"), gnome_add_xpm);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_away_mess), NULL);
+	gtk_box_pack_start(GTK_BOX(bot), button, TRUE, FALSE, 5);
+
+	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);
+
+	make_away_button = picture_button(prefs, _("Make Away"), gnome_preferences_xpm);
+	gtk_signal_connect(GTK_OBJECT(make_away_button), "clicked", GTK_SIGNAL_FUNC(do_away_mess), NULL);
+	gtk_box_pack_start(GTK_BOX(bot), make_away_button, TRUE, FALSE, 5);
+	if (!connections)
+		gtk_widget_set_sensitive(make_away_button, FALSE);
+
+	button = picture_button(prefs, _("Remove"), gnome_remove_xpm);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(remove_away_message), NULL);
+	gtk_box_pack_start(GTK_BOX(bot), button, TRUE, FALSE, 5);
+
+	if (awy != NULL) {
+		char buffer[BUF_LONG];
+		char *tmp;
+		a = (struct away_message *)awy->data;
+		g_snprintf(buffer, sizeof(buffer), "%s", a->message);
+		tmp = stylize(buffer, BUF_LONG);
+		gtk_imhtml_append_text(GTK_IMHTML(away_text), tmp, GTK_IMHTML_NO_TITLE |
+								   GTK_IMHTML_NO_COMMENTS |
+								   GTK_IMHTML_NO_NEWLINE |
+								   GTK_IMHTML_NO_SCROLL);
+		g_free(tmp);
+	}
+
+	while (awy) {
+		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_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_widget_show(label);
+		gtk_container_add(GTK_CONTAINER(prefs_away_list), list_item);
+		gtk_widget_show(list_item);
+
+		awy = awy->next;
+	}
+
 	gtk_widget_show(prefdialog);
 }
 
@@ -2383,18 +2463,13 @@
 
 void prefs_build_sound()
 {
-	GtkCTreeNode *parent, *node;
+	GtkCTreeNode *parent;
 	char *text[1];
 
 	text[0] = _("Sounds");
 	parent = gtk_ctree_insert_node(GTK_CTREE(preftree), NULL, NULL,
 				       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);
-	gtk_ctree_node_set_row_data(GTK_CTREE(preftree), node, event_page);
 }
 
 void prefs_build_away()