Mercurial > pidgin

changeset 4091:0c131a8ea3d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 4306] The saved style is once again used on chat and IM windows. You may notice that your style is set to Pictures, and until now, your IM and chat windows have been Pictures & Text. If you prefer it this way, you'll need to set your preferences to that. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Tue, 17 Dec 2002 11:03:44 +0000
parents 286d487a4fd7
children 7edd02612086
files src/buddy_chat.c src/conversation.c
diffstat 2 files changed, 36 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/buddy_chat.c	Tue Dec 17 06:53:50 2002 +0000
+++ b/src/buddy_chat.c	Tue Dec 17 11:03:44 2002 +0000
@@ -1194,7 +1194,7 @@
 
 	char buf[BUF_LONG];
 
-	/*int dispstyle = set_dispstyle(1);*/
+	int dispstyle = set_dispstyle(1);
 
 	if (chat_options & OPT_CHAT_ONE_WINDOW) {
 		if (!all_chats) {
@@ -1432,7 +1432,11 @@
 	*/
 
 	/* Send */
-	button = gaim_pixbuf_button_from_stock(_("Send"), "gtk-convert", GAIM_BUTTON_VERTICAL);
+	button = gaim_pixbuf_button_from_stock(
+				(dispstyle == 0 ? NULL : _("Send")),
+				(dispstyle == 1 ? NULL : "gtk-convert"),
+				GAIM_BUTTON_VERTICAL);
+
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(send_callback), b);
 	gtk_widget_show(button);
@@ -1444,7 +1448,11 @@
 	gtk_box_pack_start(GTK_BOX(bbox), sep, FALSE, FALSE, 0);
 
 	/* Invite */
-	button = gaim_pixbuf_button_from_stock(_("Invite"), "gtk-jump-to", GAIM_BUTTON_VERTICAL);
+	button = gaim_pixbuf_button_from_stock(
+				(dispstyle == 0 ? NULL : _("Invite")),
+				(dispstyle == 1 ? NULL : "gtk-jump-to"),
+				GAIM_BUTTON_VERTICAL);
+
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(invite_callback), b);
 	gtk_widget_show(button);
 	gtk_box_pack_end(GTK_BOX(bbox), button, FALSE, FALSE, 0);
--- a/src/conversation.c	Tue Dec 17 06:53:50 2002 +0000
+++ b/src/conversation.c	Tue Dec 17 11:03:44 2002 +0000
@@ -2795,6 +2795,7 @@
 	GtkWidget *label;
 	GtkWidget *menubar;
 	GtkWidget *tabby;
+	int dispstyle = set_dispstyle(0);
 
 	c->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 
@@ -3005,7 +3006,10 @@
 */	
 
 	/* Put the send button on the right */
-	send = gaim_pixbuf_button_from_stock(_("Send"), "gtk-convert", GAIM_BUTTON_VERTICAL);
+	send = gaim_pixbuf_button_from_stock(
+				(dispstyle == 0 ? NULL : _("Send")),
+				(dispstyle == 1 ? NULL : "gtk-convert"),
+				GAIM_BUTTON_VERTICAL);
 	c->send = send;
 	gtk_signal_connect(GTK_OBJECT(send), "clicked", GTK_SIGNAL_FUNC(send_callback), c);
 	gtk_box_pack_end(GTK_BOX(bbox), send, FALSE, FALSE, 0);
@@ -3018,30 +3022,45 @@
 	/* And put the other buttons on the left */
 
 	if (c->gc && find_buddy(c->gc, c->name) != NULL) {
-		add = gaim_pixbuf_button_from_stock(_("Remove"), "gtk-remove", GAIM_BUTTON_VERTICAL);
+		add = gaim_pixbuf_button_from_stock(
+				(dispstyle == 0 ? NULL : _("Remove")),
+				(dispstyle == 1 ? NULL : "gtk-remove"),
+				GAIM_BUTTON_VERTICAL);
 		gtk_object_set_user_data(GTK_OBJECT(add), c);
 	} else
-		add = gaim_pixbuf_button_from_stock(_("Add"), "gtk-add", GAIM_BUTTON_VERTICAL);
+		add = gaim_pixbuf_button_from_stock(
+				(dispstyle == 0 ? NULL : _("Add")),
+				(dispstyle == 1 ? NULL : "gtk-add"),
+				GAIM_BUTTON_VERTICAL);
 
 	c->add = add;
 	gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(add_callback), c);
 	gtk_box_pack_start(GTK_BOX(bbox), add, FALSE, FALSE, 0);
 	gtk_widget_show(add);
 
-	warn = gaim_pixbuf_button_from_stock(_("Warn"), "gtk-dialog-warning", GAIM_BUTTON_VERTICAL);
+	warn = gaim_pixbuf_button_from_stock(
+				(dispstyle == 0 ? NULL : _("Warn")),
+				(dispstyle == 1 ? NULL : "gtk-dialog-warning"),
+				GAIM_BUTTON_VERTICAL);
 	c->warn = warn;
 	gtk_signal_connect(GTK_OBJECT(warn), "clicked", GTK_SIGNAL_FUNC(warn_callback), c);
 	gtk_box_pack_start(GTK_BOX(bbox), warn, FALSE, FALSE, 0);
 	gtk_widget_show(warn);
 
-	info = gaim_pixbuf_button_from_stock(_("Info"), "gtk-find", GAIM_BUTTON_VERTICAL);
+	info = gaim_pixbuf_button_from_stock(
+				(dispstyle == 0 ? NULL : _("Info")),
+				(dispstyle == 1 ? NULL : "gtk-find"),
+				GAIM_BUTTON_VERTICAL);
 	c->info = info;
 	gtk_signal_connect(GTK_OBJECT(info), "clicked", GTK_SIGNAL_FUNC(info_callback), c);
 	gtk_box_pack_start(GTK_BOX(bbox), info, FALSE, FALSE, 0);
 	gtk_widget_show(info);
 
 
-	block = gaim_pixbuf_button_from_stock(_("Block"), "gtk-stop", GAIM_BUTTON_VERTICAL);
+	block = gaim_pixbuf_button_from_stock(
+				(dispstyle == 0 ? NULL : _("Block")),
+				(dispstyle == 1 ? NULL : "gtk-stop"),
+				GAIM_BUTTON_VERTICAL);
 	c->block = block;
 	gtk_signal_connect(GTK_OBJECT(block), "clicked", GTK_SIGNAL_FUNC(block_callback), c);
 	gtk_box_pack_start(GTK_BOX(bbox), block, FALSE, FALSE, 0);