diff src/conversation.c @ 915:378c862a2381

[gaim-migrate @ 925] bmiller is damn cool. he did everything i asked for, the next day even. committer: Tailor Script <[e-mail]>

--- a/src/conversation.c	Fri Sep 15 16:51:31 2000 +0000
+++ b/src/conversation.c	Fri Sep 15 18:24:32 2000 +0000
@@ -427,8 +427,11 @@
 void add_callback(GtkWidget *widget, struct conversation *c)
 {
 	if (find_buddy(c->name) != NULL) {
-		gboolean dispstyle = (display_options & OPT_DISP_CONV_SHOW_TEXT) ? TRUE : FALSE;
+		int dispstyle;
 		GtkWidget *parent = c->add->parent;
+
+		dispstyle = set_dispstyle(0);
+
 		sprintf(debug_buff,_("Removing '%s' from buddylist.\n"), c->name);
 		debug_print(debug_buff);
 		remove_buddy(find_group_by_buddy(c->name), find_buddy(c->name));
@@ -1634,15 +1637,8 @@
 	aol_icon(win->window);
         
 	c->window = win;
-       
-	if (display_options & OPT_DISP_CONV_SHOW_TEXT)
-	{
-		dispstyle = TRUE;
-	}
-	else
-	{
-		dispstyle = FALSE;
-	}
+
+	dispstyle = set_dispstyle(0);
 
 	send = picture_button2(win, _("Send"), tmp_send_xpm, dispstyle);
 	info = picture_button2(win, _("Info"), tb_search_xpm, dispstyle);