Mercurial > pidgin

changeset 769:c075cf268129

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 779] I'm Only Sleeping by the Beatles when i wake up early in the morning lift my head, i'm still yawning when i'm in the middle of a dream stay in bed, float upstream (chorus) please don't wake me, no don't shake me, leave me where i am, i'm only sleeping everybody seems to think i'm lazy i don't mind. i think they're crazy running everywhere at such a speed until they find there's no need (chorus) (chorus) committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Fri, 25 Aug 2000 22:03:29 +0000
parents 0b160e27904b
children 172c5cf98dfa
files src/conversation.c src/dialogs.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/conversation.c	Fri Aug 25 21:18:35 2000 +0000
+++ b/src/conversation.c	Fri Aug 25 22:03:29 2000 +0000
@@ -420,15 +420,16 @@
 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;
 		GtkWidget *parent = c->add_button->parent;
 		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));
 		build_edit_tree();
 		gtk_widget_destroy(c->add_button);
-		c->add_button = picture_button2(c->window, _("Add"), gnome_add_xpm, display_options & OPT_DISP_CONV_SHOW_TEXT);
+		c->add_button = picture_button2(c->window, _("Add"), gnome_add_xpm, dispstyle);
 		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_pack_end(GTK_BOX(parent), c->add_button, dispstyle, dispstyle, 0);
 		gtk_box_reorder_child(GTK_BOX(parent), c->add_button, 1);
 		gtk_widget_show(c->add_button);
 	}
--- a/src/dialogs.c	Fri Aug 25 21:18:35 2000 +0000
+++ b/src/dialogs.c	Fri Aug 25 22:03:29 2000 +0000
@@ -780,11 +780,12 @@
         add_buddy(grp, who, NULL);
 
         if (c != NULL) {
+		gboolean dispstyle = (display_options & OPT_DISP_CONV_SHOW_TEXT) ? TRUE : FALSE;
 		GtkWidget *parent = c->add_button->parent;
 		gtk_widget_destroy(c->add_button);
-		c->add_button = picture_button2(c->window, _("Remove"), gnome_remove_xpm, display_options & OPT_DISP_CONV_SHOW_TEXT);
+		c->add_button = picture_button2(c->window, _("Remove"), gnome_remove_xpm, dispstyle);
 		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_pack_end(GTK_BOX(parent), c->add_button, dispstyle, dispstyle, 0);
 		gtk_box_reorder_child(GTK_BOX(parent), c->add_button, 1);
 		gtk_widget_show(c->add_button);
 	}