# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 968621918 0
# Node ID 9b8b83592bb6594bb62b0579748e38b54f4ca51c
# Parent  6cca24db6137a66e43bb593aa4b680477d912ac3
[gaim-migrate @ 880]
Here's a story, of a man named Brady ..

committer: Tailor Script <tailor@pidgin.im>

diff -r 6cca24db6137 -r 9b8b83592bb6 src/buddy.c
--- a/src/buddy.c	Sun Sep 10 05:53:15 2000 +0000
+++ b/src/buddy.c	Sun Sep 10 21:38:38 2000 +0000
@@ -77,6 +77,7 @@
 
 #include "pixmaps/tmp_send.xpm"
 #include "pixmaps/tb_search.xpm"
+#include "pixmaps/join.xpm"
 
 static GtkTooltips *tips;
 static GtkWidget *editpane;
@@ -251,7 +252,7 @@
 		adjust_pic(rembutton, _("Remove"), (gchar **)buddydel_xpm);
 	}
 	if (!(display_options & OPT_DISP_NO_BUTTONS)) {
-		adjust_pic(chatbutton, _("Chat"), (gchar **)tb_search_xpm);
+		adjust_pic(chatbutton, _("Chat"), (gchar **)join_xpm);
 	        adjust_pic(imbutton, _("IM"), (gchar **)tmp_send_xpm);
 	        adjust_pic(infobutton, _("Info"), (gchar **)tb_search_xpm);
 	}
@@ -1776,7 +1777,7 @@
 
 	// gaim_new_item(menu, _("Add A Buddy"), GTK_SIGNAL_FUNC(add_buddy_callback));
 	gaim_new_item_with_pixmap(menu, _("Add A Buddy"), add_small_xpm, GTK_SIGNAL_FUNC(add_buddy_callback));
-	gaim_new_item_with_pixmap(menu, _("Join A Chat"), add_small_xpm, GTK_SIGNAL_FUNC(chat_callback));
+	gaim_new_item_with_pixmap(menu, _("Join A Chat"), pounce_small_xpm, GTK_SIGNAL_FUNC(chat_callback));
         gaim_seperator(menu);
         gaim_new_item_with_pixmap(menu, _("Import Buddy List"), import_small_xpm, GTK_SIGNAL_FUNC(import_callback));
         gaim_new_item_with_pixmap(menu, _("Export Buddy List"), export_small_xpm,GTK_SIGNAL_FUNC(export_callback));
diff -r 6cca24db6137 -r 9b8b83592bb6 src/gaimrc.c
--- a/src/gaimrc.c	Sun Sep 10 05:53:15 2000 +0000
+++ b/src/gaimrc.c	Sun Sep 10 21:38:38 2000 +0000
@@ -677,13 +677,23 @@
                 OPT_GEN_SAVED_WINDOWS |
                 OPT_GEN_REMEMBER_PASS |
 		OPT_GEN_REGISTERED |
-		OPT_GEN_NEAR_APPLET; 
+		OPT_GEN_NEAR_APPLET |
+		OPT_GEN_CTL_SMILEYS |
+		OPT_GEN_CTL_CHARS; 
+
         display_options =
                 OPT_DISP_SHOW_IDLETIME |
                 OPT_DISP_SHOW_TIME |
                 OPT_DISP_SHOW_PIXMAPS |
                 OPT_DISP_SHOW_BUDDYTICKER |
-                OPT_DISP_SHOW_BUTTON_XPM;
+                OPT_DISP_SHOW_BUTTON_XPM |
+		OPT_DISP_SHOW_SMILEY |
+		OPT_DISP_COOL_LOOK |
+		OPT_DISP_CONV_SHOW_TEXT |
+		OPT_DISP_CHAT_SHOW_TEXT |
+		OPT_DISP_CONV_BIG_ENTRY |
+		OPT_DISP_CHAT_BIG_ENTRY;
+
 	font_options = 0; 
         sound_options = OPT_SOUND_LOGIN | OPT_SOUND_LOGOUT | OPT_SOUND_RECV | OPT_SOUND_SEND | OPT_SOUND_SILENT_SIGNON;
         report_idle = IDLE_GAIM;