# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 967139704 0
# Node ID c5f455b6f79aca9e4f5ee4fedb4fbdcf0988a0d0
# Parent  16c2682b56781d3a4485af9c9de873759d85a62d
[gaim-migrate @ 766]
Fixed a small bug with text not always displaying when it should.

committer: Tailor Script <tailor@pidgin.im>

diff -r 16c2682b5678 -r c5f455b6f79a src/conversation.c
--- a/src/conversation.c	Thu Aug 24 17:44:09 2000 +0000
+++ b/src/conversation.c	Thu Aug 24 17:55:04 2000 +0000
@@ -426,7 +426,7 @@
 		remove_buddy(find_group_by_buddy(c->name), find_buddy(c->name));
 		build_edit_tree();
 		gtk_widget_destroy(c->add_button);
-		c->add_button = picture_button(c->window, NULL, gnome_add_xpm);
+		c->add_button = picture_button2(c->window, _("Add"), gnome_add_xpm, display_options & OPT_DISP_CONV_SHOW_TEXT);
 		gtk_signal_connect(GTK_OBJECT(c->add_button), "clicked", GTK_SIGNAL_FUNC(add_callback), c);
 		gtk_box_pack_end(GTK_BOX(parent), c->add_button, FALSE, FALSE, 0);
 		gtk_box_reorder_child(GTK_BOX(parent), c->add_button, 1);
diff -r 16c2682b5678 -r c5f455b6f79a src/dialogs.c
--- a/src/dialogs.c	Thu Aug 24 17:44:09 2000 +0000
+++ b/src/dialogs.c	Thu Aug 24 17:55:04 2000 +0000
@@ -782,7 +782,7 @@
         if (c != NULL) {
 		GtkWidget *parent = c->add_button->parent;
 		gtk_widget_destroy(c->add_button);
-		c->add_button = picture_button(c->window, NULL, gnome_remove_xpm);
+		c->add_button = picture_button2(c->window, _("Remove"), gnome_remove_xpm, display_options & OPT_DISP_CONV_SHOW_TEXT);
 		gtk_signal_connect(GTK_OBJECT(c->add_button), "clicked", GTK_SIGNAL_FUNC(add_callback), c);
 		gtk_box_pack_end(GTK_BOX(parent), c->add_button, FALSE, FALSE, 0);
 		gtk_box_reorder_child(GTK_BOX(parent), c->add_button, 1);