From: Sean E. <sea...@us...> - 2002-06-18 22:59:30
|
Update of /cvsroot/gaim/gaim/src In directory usw-pr-cvs1:/tmp/cvs-serv21481/src Modified Files: dialogs.c Log Message: patch -r Index: dialogs.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v retrieving revision 1.323 retrieving revision 1.324 diff -u -d -r1.323 -r1.324 --- dialogs.c 18 Jun 2002 00:35:23 -0000 1.323 +++ dialogs.c 18 Jun 2002 22:59:22 -0000 1.324 @@ -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); + 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); - gdk_pixmap_unref(pm); - gdk_bitmap_unref(mask); + gtk_widget_show(pixmap); - 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; + gdk_pixmap_unref(pm); + gdk_bitmap_unref(mask); + } - default: - break; + 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"); |