Mercurial > pidgin.yaz

changeset 3327:220c9f1fc75e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 3345] patch -r committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Tue, 18 Jun 2002 22:59:22 +0000
parents 03daf01a8000
children d183c2703508
files src/dialogs.c
diffstat 1 files changed, 15 insertions(+), 52 deletions(-) [+]
line wrap: on
line diff
--- a/src/dialogs.c	Tue Jun 18 00:49:55 2002 +0000
+++ b/src/dialogs.c	Tue Jun 18 22:59:22 2002 +0000
@@ -4288,60 +4288,23 @@
 	button_box_2 = gtk_vbox_new(FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(button_box), button_box_2, TRUE, TRUE, 0);
-
 	gtk_widget_show(button_box_2);
 	gtk_widget_show(button_box);
-	
-	switch(dispstyle) {
-		case 0:
-			/* Display just pixmap */
-			pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
-			pixmap = gtk_pixmap_new(pm, mask);
-			gtk_box_pack_start(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
-			
-			gtk_widget_show(pixmap);
-			
-			gdk_pixmap_unref(pm);
-			gdk_bitmap_unref(mask);
-			break;
-
-		case 1:
-			/* Display just label */
-			label = gtk_label_new(text);
-			gtk_widget_show(label);
-			gtk_box_pack_start(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
-			break;
-
-		case 2:
-			/* Display pixmap and label */
-			{
-				GtkWidget *button_box_top = gtk_vbox_new(FALSE, 0);
-				GtkWidget *button_box_bottom = gtk_vbox_new(FALSE, 0); 
-				
-				pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
-				pixmap = gtk_pixmap_new(pm, mask);
-				gtk_box_pack_end(GTK_BOX(button_box_top), pixmap, FALSE, FALSE, 0);
-
-				gtk_widget_show(pixmap);
-
-				gdk_pixmap_unref(pm);
-				gdk_bitmap_unref(mask);
-
-				label = gtk_label_new(text);
-				gtk_widget_show(label);
-				gtk_box_pack_start(GTK_BOX(button_box_bottom), label, FALSE, FALSE, 0);
-						
-				gtk_box_pack_start(GTK_BOX(button_box_2), button_box_top, TRUE,
-							TRUE, 0);
-				gtk_box_pack_start(GTK_BOX(button_box_2), button_box_bottom, TRUE,
-							TRUE, 0);
-				gtk_widget_show(button_box_top);
-				gtk_widget_show(button_box_bottom);
-			}
-			break;
-
-		default:
-			break;
+	if (dispstyle == 2 || dispstyle == 0) {
+		pm = gdk_pixmap_create_from_xpm_d(window->window, &mask, NULL, xpm);
+		pixmap = gtk_pixmap_new(pm, mask);
+		gtk_box_pack_start(GTK_BOX(button_box_2), pixmap, FALSE, FALSE, 0);
+
+		gtk_widget_show(pixmap);
+
+		gdk_pixmap_unref(pm);
+		gdk_bitmap_unref(mask);
+	}
+
+	if (dispstyle == 2 || dispstyle == 1) {
+		label = gtk_label_new(text);
+		gtk_widget_show(label);
+		gtk_box_pack_end(GTK_BOX(button_box_2), label, FALSE, FALSE, 0);
 	}
 
 	gtk_tooltips_set_tip(button_tips, button, text, "Gaim");