comparison src/util.c @ 2313:bd9d403fb15b

[gaim-migrate @ 2323] more room committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Thu, 20 Sep 2001 01:23:04 +0000
parents 07c6d1d3e3fd
children 25e7c2a68ed2
comparison
equal deleted inserted replaced
2312:766603034af8 2313:bd9d403fb15b
854 GdkBitmap *mask; 854 GdkBitmap *mask;
855 GdkPixmap *pm; 855 GdkPixmap *pm;
856 GtkWidget *pixmap; 856 GtkWidget *pixmap;
857 857
858 button = gtk_button_new(); 858 button = gtk_button_new();
859 if (display_options & OPT_DISP_COOL_LOOK) 859 if (misc_options & OPT_MISC_COOL_LOOK)
860 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 860 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
861 861
862 button_box = gtk_hbox_new(FALSE, 5); 862 button_box = gtk_hbox_new(FALSE, 5);
863 gtk_container_add(GTK_CONTAINER(button), button_box); 863 gtk_container_add(GTK_CONTAINER(button), button_box);
864 864
901 GtkWidget *label; 901 GtkWidget *label;
902 902
903 if (!button_tips) 903 if (!button_tips)
904 button_tips = gtk_tooltips_new(); 904 button_tips = gtk_tooltips_new();
905 button = gtk_button_new(); 905 button = gtk_button_new();
906 if (display_options & OPT_DISP_COOL_LOOK) 906 if (misc_options & OPT_MISC_COOL_LOOK)
907 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); 907 gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
908 908
909 button_box = gtk_hbox_new(FALSE, 0); 909 button_box = gtk_hbox_new(FALSE, 0);
910 gtk_container_add(GTK_CONTAINER(button), button_box); 910 gtk_container_add(GTK_CONTAINER(button), button_box);
911 911
1121 int set_dispstyle(int chat) 1121 int set_dispstyle(int chat)
1122 { 1122 {
1123 int dispstyle; 1123 int dispstyle;
1124 1124
1125 if (chat) { 1125 if (chat) {
1126 switch (display_options & (OPT_DISP_CHAT_BUTTON_TEXT | OPT_DISP_CHAT_BUTTON_XPM)) { 1126 switch (chat_options & (OPT_CHAT_BUTTON_TEXT | OPT_CHAT_BUTTON_XPM)) {
1127 case OPT_DISP_CHAT_BUTTON_TEXT: 1127 case OPT_CHAT_BUTTON_TEXT:
1128 dispstyle = 1; 1128 dispstyle = 1;
1129 break; 1129 break;
1130 case OPT_DISP_CHAT_BUTTON_XPM: 1130 case OPT_CHAT_BUTTON_XPM:
1131 dispstyle = 0; 1131 dispstyle = 0;
1132 break; 1132 break;
1133 default: /* both or neither */ 1133 default: /* both or neither */
1134 dispstyle = 2; 1134 dispstyle = 2;
1135 break; 1135 break;
1136 } 1136 }
1137 } else { 1137 } else {
1138 switch (display_options & (OPT_DISP_CONV_BUTTON_TEXT | OPT_DISP_CONV_BUTTON_XPM)) { 1138 switch (im_options & (OPT_IM_BUTTON_TEXT | OPT_IM_BUTTON_XPM)) {
1139 case OPT_DISP_CONV_BUTTON_TEXT: 1139 case OPT_IM_BUTTON_TEXT:
1140 dispstyle = 1; 1140 dispstyle = 1;
1141 break; 1141 break;
1142 case OPT_DISP_CONV_BUTTON_XPM: 1142 case OPT_IM_BUTTON_XPM:
1143 dispstyle = 0; 1143 dispstyle = 0;
1144 break; 1144 break;
1145 default: /* both or neither */ 1145 default: /* both or neither */
1146 dispstyle = 2; 1146 dispstyle = 2;
1147 break; 1147 break;