Mercurial > pidgin

comparison src/buddy.c @ 2313:bd9d403fb15b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 cc462108c101
children b53cd5b63a99
comparison
equal deleted inserted replaced
2312:766603034af8 2313:bd9d403fb15b
303 GdkBitmap *bm; 303 GdkBitmap *bm;
304 GtkWidget *pic; 304 GtkWidget *pic;
305 GtkWidget *label; 305 GtkWidget *label;
306 306
307 /*if the user had opted to put pictures on the buttons*/ 307 /*if the user had opted to put pictures on the buttons*/
308 if (display_options & OPT_DISP_SHOW_BUTTON_XPM && xpm) { 308 if (blist_options & OPT_BLIST_SHOW_BUTTON_XPM && xpm) {
309 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm); 309 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm);
310 pic = gtk_pixmap_new(pm, bm); 310 pic = gtk_pixmap_new(pm, bm);
311 gtk_widget_show(pic); 311 gtk_widget_show(pic);
312 gdk_pixmap_unref(pm); 312 gdk_pixmap_unref(pm);
313 gdk_bitmap_unref(bm); 313 gdk_bitmap_unref(bm);
324 324
325 } 325 }
326 326
327 327
328 void toggle_show_empty_groups() { 328 void toggle_show_empty_groups() {
329 if (display_options & OPT_DISP_NO_MT_GRP) { 329 if (blist_options & OPT_BLIST_NO_MT_GRP) {
330 /* remove any group_shows with empty members */ 330 /* remove any group_shows with empty members */
331 GSList *s = shows; 331 GSList *s = shows;
332 struct group_show *g; 332 struct group_show *g;
333 333
334 while (s) { 334 while (s) {
374 while (s) { 374 while (s) {
375 g = s->data; 375 g = s->data;
376 m = g->members; 376 m = g->members;
377 while (m) { 377 while (m) {
378 b = m->data; 378 b = m->data;
379 if (display_options & OPT_DISP_SHOW_PIXMAPS) 379 if (blist_options & OPT_BLIST_SHOW_PIXMAPS)
380 gtk_widget_show(b->pix); 380 gtk_widget_show(b->pix);
381 else 381 else
382 gtk_widget_hide(b->pix); 382 gtk_widget_hide(b->pix);
383 m = m->next; 383 m = m->next;
384 } 384 }
413 b = (struct buddy_show *)c->data; 413 b = (struct buddy_show *)c->data;
414 on += g_slist_length(b->connlist); 414 on += g_slist_length(b->connlist);
415 c = g_slist_next(c); 415 c = g_slist_next(c);
416 } 416 }
417 417
418 if (display_options & OPT_DISP_SHOW_GRPNUM) 418 if (blist_options & OPT_BLIST_SHOW_GRPNUM)
419 g_snprintf(buf, sizeof buf, "%s (%d/%d)", gs->name, on, total); 419 g_snprintf(buf, sizeof buf, "%s (%d/%d)", gs->name, on, total);
420 else 420 else
421 g_snprintf(buf, sizeof buf, "%s", gs->name); 421 g_snprintf(buf, sizeof buf, "%s", gs->name);
422 422
423 gtk_label_set_text(GTK_LABEL(gs->label), buf); 423 gtk_label_set_text(GTK_LABEL(gs->label), buf);
439 439
440 adjust_pic(addbutton, _("Add"), (gchar **)gnome_add_xpm); 440 adjust_pic(addbutton, _("Add"), (gchar **)gnome_add_xpm);
441 adjust_pic(groupbutton, _("Group"), (gchar **)group_xpm); 441 adjust_pic(groupbutton, _("Group"), (gchar **)group_xpm);
442 adjust_pic(rembutton, _("Remove"), (gchar **)gnome_remove_xpm); 442 adjust_pic(rembutton, _("Remove"), (gchar **)gnome_remove_xpm);
443 443
444 if (!(display_options & OPT_DISP_NO_BUTTONS)) { 444 if (!(blist_options & OPT_BLIST_NO_BUTTONS)) {
445 adjust_pic(awaybutton, _("Away"), (gchar **)away_big_xpm); 445 adjust_pic(awaybutton, _("Away"), (gchar **)away_big_xpm);
446 adjust_pic(chatbutton, _("Chat"), (gchar **)join_xpm); 446 adjust_pic(chatbutton, _("Chat"), (gchar **)join_xpm);
447 adjust_pic(imbutton, _("IM"), (gchar **)tmp_send_xpm); 447 adjust_pic(imbutton, _("IM"), (gchar **)tmp_send_xpm);
448 adjust_pic(infobutton, _("Info"), (gchar **)tb_search_xpm); 448 adjust_pic(infobutton, _("Info"), (gchar **)tb_search_xpm);
449 } 449 }
450 gtk_widget_hide(addbutton->parent); 450 gtk_widget_hide(addbutton->parent);
451 gtk_widget_show(addbutton->parent); 451 gtk_widget_show(addbutton->parent);
452 if (!(display_options & OPT_DISP_NO_BUTTONS)) { 452 if (!(blist_options & OPT_BLIST_NO_BUTTONS)) {
453 gtk_widget_hide(chatbutton->parent); 453 gtk_widget_hide(chatbutton->parent);
454 gtk_widget_show(chatbutton->parent); 454 gtk_widget_show(chatbutton->parent);
455 } 455 }
456 } 456 }
457 457
539 applet_widget_unregister_callback(APPLET_WIDGET(applet),"signoff"); 539 applet_widget_unregister_callback(APPLET_WIDGET(applet),"signoff");
540 remove_applet_away(); 540 remove_applet_away();
541 #else 541 #else
542 show_login(); 542 show_login();
543 #endif /* USE_APPLET */ 543 #endif /* USE_APPLET */
544 if ( display_options & OPT_DISP_SHOW_BUDDYTICKER ) 544 if ( misc_options & OPT_MISC_BUDDY_TICKER )
545 BuddyTickerSignoff(); 545 BuddyTickerSignoff();
546 } 546 }
547 547
548 void handle_click_group(GtkWidget *widget, GdkEventButton *event, struct group *g) 548 void handle_click_group(GtkWidget *widget, GdkEventButton *event, struct group *g)
549 { 549 {
642 gdk_window_show(c->window->window); 642 gdk_window_show(c->window->window);
643 else 643 else
644 c = new_conversation(b->name); 644 c = new_conversation(b->name);
645 645
646 set_convo_gc(c, b->connlist->data); 646 set_convo_gc(c, b->connlist->data);
647 if (display_options & OPT_DISP_ONE_WINDOW) 647 if (im_options & OPT_IM_ONE_WINDOW)
648 raise_convo_tab(c); 648 raise_convo_tab(c);
649 } else if (event->type == GDK_BUTTON_PRESS && event->button == 3) { 649 } else if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
650 GtkWidget *menu; 650 GtkWidget *menu;
651 GtkWidget *button; 651 GtkWidget *button;
652 GtkWidget *menuitem; 652 GtkWidget *menuitem;
885 remove_buddy_show(gs, bs); 885 remove_buddy_show(gs, bs);
886 g_free(bs->show); 886 g_free(bs->show);
887 g_free(bs->name); 887 g_free(bs->name);
888 g_free(bs); 888 g_free(bs);
889 if (!g_slist_length(gs->members) && 889 if (!g_slist_length(gs->members) &&
890 (display_options & OPT_DISP_NO_MT_GRP)) { 890 (blist_options & OPT_BLIST_NO_MT_GRP)) {
891 shows = g_slist_remove(shows, gs); 891 shows = g_slist_remove(shows, gs);
892 gtk_tree_remove_item(GTK_TREE(buddies), gs->item); 892 gtk_tree_remove_item(GTK_TREE(buddies), gs->item);
893 g_free(gs->name); 893 g_free(gs->name);
894 g_free(gs); 894 g_free(gs);
895 } else 895 } else
1030 gr = gc->groups; 1030 gr = gc->groups;
1031 while (gr) { 1031 while (gr) {
1032 g = (struct group *)gr->data; 1032 g = (struct group *)gr->data;
1033 gr = gr->next; 1033 gr = gr->next;
1034 gs = find_group_show(g->name); 1034 gs = find_group_show(g->name);
1035 if (!gs && !(display_options & OPT_DISP_NO_MT_GRP)) 1035 if (!gs && !(blist_options & OPT_BLIST_NO_MT_GRP))
1036 gs = new_group_show(g->name); 1036 gs = new_group_show(g->name);
1037 m = g->members; 1037 m = g->members;
1038 while (m) { 1038 while (m) {
1039 b = (struct buddy *)m->data; 1039 b = (struct buddy *)m->data;
1040 m = m->next; 1040 m = m->next;
1359 p = gtk_ctree_insert_node(GTK_CTREE(edittree), c, 1359 p = gtk_ctree_insert_node(GTK_CTREE(edittree), c,
1360 NULL, text, 5, NULL, NULL, 1360 NULL, text, 5, NULL, NULL,
1361 NULL, NULL, 0, 1); 1361 NULL, NULL, 0, 1);
1362 gtk_ctree_node_set_row_data(GTK_CTREE(edittree), p, g); 1362 gtk_ctree_node_set_row_data(GTK_CTREE(edittree), p, g);
1363 1363
1364 if (!(display_options & OPT_DISP_NO_MT_GRP) && !find_group_show(group)) 1364 if (!(blist_options & OPT_BLIST_NO_MT_GRP) && !find_group_show(group))
1365 new_group_show(group); 1365 new_group_show(group);
1366 1366
1367 return g; 1367 return g;
1368 } 1368 }
1369 1369
2033 2033
2034 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm ? xpm : no_icon_xpm); 2034 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm ? xpm : no_icon_xpm);
2035 b->pix = gtk_pixmap_new(pm, bm); 2035 b->pix = gtk_pixmap_new(pm, bm);
2036 gtk_box_pack_start(GTK_BOX(box), b->pix, FALSE, FALSE, 1); 2036 gtk_box_pack_start(GTK_BOX(box), b->pix, FALSE, FALSE, 1);
2037 gtk_widget_show(b->pix); 2037 gtk_widget_show(b->pix);
2038 if (!(display_options & OPT_DISP_SHOW_PIXMAPS)) 2038 if (!(blist_options & OPT_BLIST_SHOW_PIXMAPS))
2039 gtk_widget_hide(b->pix); 2039 gtk_widget_hide(b->pix);
2040 gdk_pixmap_unref(pm); 2040 gdk_pixmap_unref(pm);
2041 gdk_bitmap_unref(bm); 2041 gdk_bitmap_unref(bm);
2042 2042
2043 b->label = gtk_label_new(buddy->show); 2043 b->label = gtk_label_new(buddy->show);
2112 g->members = g_slist_remove(g->members, b); 2112 g->members = g_slist_remove(g->members, b);
2113 if (blist) 2113 if (blist)
2114 remove_buddy_show(g, b); 2114 remove_buddy_show(g, b);
2115 else 2115 else
2116 debug_printf("log_timeout but buddy list not available\n"); 2116 debug_printf("log_timeout but buddy list not available\n");
2117 if ((g->members == NULL) && (display_options & OPT_DISP_NO_MT_GRP)) { 2117 if ((g->members == NULL) && (blist_options & OPT_BLIST_NO_MT_GRP)) {
2118 shows = g_slist_remove(shows, g); 2118 shows = g_slist_remove(shows, g);
2119 if (blist) 2119 if (blist)
2120 gtk_tree_remove_item(GTK_TREE(buddies), g->item); 2120 gtk_tree_remove_item(GTK_TREE(buddies), g->item);
2121 g_free(g->name); 2121 g_free(g->name);
2122 g_free(g); 2122 g_free(g);
2138 xpm = (char **)no_icon_xpm; 2138 xpm = (char **)no_icon_xpm;
2139 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm); 2139 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm);
2140 gtk_widget_hide(b->pix); 2140 gtk_widget_hide(b->pix);
2141 gtk_pixmap_set(GTK_PIXMAP(b->pix), pm, bm); 2141 gtk_pixmap_set(GTK_PIXMAP(b->pix), pm, bm);
2142 gtk_widget_show(b->pix); 2142 gtk_widget_show(b->pix);
2143 if (!(display_options & OPT_DISP_SHOW_PIXMAPS)) 2143 if (!(blist_options & OPT_BLIST_SHOW_PIXMAPS))
2144 gtk_widget_hide(b->pix); 2144 gtk_widget_hide(b->pix);
2145 if (display_options & OPT_DISP_SHOW_BUDDYTICKER) 2145 if (misc_options & OPT_MISC_BUDDY_TICKER)
2146 BuddyTickerSetPixmap(b->name, pm, bm); 2146 BuddyTickerSetPixmap(b->name, pm, bm);
2147 gdk_pixmap_unref(pm); 2147 gdk_pixmap_unref(pm);
2148 gdk_bitmap_unref(bm); 2148 gdk_bitmap_unref(bm);
2149 gtk_timeout_remove(b->log_timer); 2149 gtk_timeout_remove(b->log_timer);
2150 b->log_timer = 0; 2150 b->log_timer = 0;
2226 gtk_widget_hide(bs->idle); 2226 gtk_widget_hide(bs->idle);
2227 if (b->idle) 2227 if (b->idle)
2228 gtk_label_set(GTK_LABEL(bs->idle), idlet); 2228 gtk_label_set(GTK_LABEL(bs->idle), idlet);
2229 else 2229 else
2230 gtk_label_set(GTK_LABEL(bs->idle), ""); 2230 gtk_label_set(GTK_LABEL(bs->idle), "");
2231 if (display_options & OPT_DISP_SHOW_IDLETIME) 2231 if (blist_options & OPT_BLIST_SHOW_IDLETIME)
2232 gtk_widget_show(bs->idle); 2232 gtk_widget_show(bs->idle);
2233 2233
2234 /* now we do the tooltip */ 2234 /* now we do the tooltip */
2235 if (b->signon) { 2235 if (b->signon) {
2236 char *stime = sec_to_text(t - b->signon + 2236 char *stime = sec_to_text(t - b->signon +
2252 warn[0] = '\0'; 2252 warn[0] = '\0';
2253 warnl[0] = '\0'; 2253 warnl[0] = '\0';
2254 } 2254 }
2255 gtk_widget_hide(bs->warn); 2255 gtk_widget_hide(bs->warn);
2256 gtk_label_set(GTK_LABEL(bs->warn), warnl); 2256 gtk_label_set(GTK_LABEL(bs->warn), warnl);
2257 if (display_options & OPT_DISP_SHOW_WARN) 2257 if (blist_options & OPT_BLIST_SHOW_WARN)
2258 gtk_widget_show(bs->warn); 2258 gtk_widget_show(bs->warn);
2259 2259
2260 if (b->caps) 2260 if (b->caps)
2261 g_snprintf(caps, sizeof caps, _("Capabilities: %s\n"), caps_string(b->caps)); 2261 g_snprintf(caps, sizeof caps, _("Capabilities: %s\n"), caps_string(b->caps));
2262 else 2262 else
2318 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, 2318 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
2319 NULL, (char **)login_icon_xpm); 2319 NULL, (char **)login_icon_xpm);
2320 gtk_widget_hide(bs->pix); 2320 gtk_widget_hide(bs->pix);
2321 gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm); 2321 gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm);
2322 gtk_widget_show(bs->pix); 2322 gtk_widget_show(bs->pix);
2323 if (display_options & OPT_DISP_SHOW_BUDDYTICKER) { 2323 if (misc_options & OPT_MISC_BUDDY_TICKER) {
2324 BuddyTickerAddUser(b->name, pm, bm); 2324 BuddyTickerAddUser(b->name, pm, bm);
2325 gtk_timeout_add(10000, (GtkFunction)BuddyTickerLogonTimeout, b->name); 2325 gtk_timeout_add(10000, (GtkFunction)BuddyTickerLogonTimeout, b->name);
2326 } 2326 }
2327 gdk_pixmap_unref(pm); 2327 gdk_pixmap_unref(pm);
2328 gdk_bitmap_unref(bm); 2328 gdk_bitmap_unref(bm);
2329 b->present = 2; 2329 b->present = 2;
2330 if (bs->log_timer > 0) 2330 if (bs->log_timer > 0)
2331 gtk_timeout_remove(bs->log_timer); 2331 gtk_timeout_remove(bs->log_timer);
2332 bs->log_timer = gtk_timeout_add(10000, (GtkFunction)log_timeout, bs); 2332 bs->log_timer = gtk_timeout_add(10000, (GtkFunction)log_timeout, bs);
2333 update_num_group(gs); 2333 update_num_group(gs);
2334 if ((bs->sound != 2) && (display_options & OPT_DISP_SHOW_LOGON)) { 2334 if ((bs->sound != 2) && (im_options & OPT_IM_LOGON)) {
2335 struct conversation *c = find_conversation(b->name); 2335 struct conversation *c = find_conversation(b->name);
2336 if (c) { 2336 if (c) {
2337 char tmp[1024]; 2337 char tmp[1024];
2338 g_snprintf(tmp, sizeof(tmp), _("%s logged in."), b->name); 2338 g_snprintf(tmp, sizeof(tmp), _("%s logged in."), b->name);
2339 write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time((time_t)NULL)); 2339 write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time((time_t)NULL));
2347 xpm = (char **)no_icon_xpm; 2347 xpm = (char **)no_icon_xpm;
2348 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm); 2348 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm);
2349 gtk_widget_hide(bs->pix); 2349 gtk_widget_hide(bs->pix);
2350 gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm); 2350 gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm);
2351 gtk_widget_show(bs->pix); 2351 gtk_widget_show(bs->pix);
2352 if (!(display_options & OPT_DISP_SHOW_PIXMAPS)) 2352 if (!(blist_options & OPT_BLIST_SHOW_PIXMAPS))
2353 gtk_widget_hide(bs->pix); 2353 gtk_widget_hide(bs->pix);
2354 if (display_options & OPT_DISP_SHOW_BUDDYTICKER) 2354 if (misc_options & OPT_MISC_BUDDY_TICKER)
2355 BuddyTickerSetPixmap(b->name, pm, bm); 2355 BuddyTickerSetPixmap(b->name, pm, bm);
2356 gdk_pixmap_unref(pm); 2356 gdk_pixmap_unref(pm);
2357 gdk_bitmap_unref(bm); 2357 gdk_bitmap_unref(bm);
2358 } 2358 }
2359 update_idle_time(bs); 2359 update_idle_time(bs);
2375 update_num_group(gs); 2375 update_num_group(gs);
2376 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, logout_icon_xpm); 2376 pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, logout_icon_xpm);
2377 gtk_widget_hide(bs->pix); 2377 gtk_widget_hide(bs->pix);
2378 gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm); 2378 gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm);
2379 gtk_widget_show(bs->pix); 2379 gtk_widget_show(bs->pix);
2380 if (display_options & OPT_DISP_SHOW_BUDDYTICKER) { 2380 if (misc_options & OPT_MISC_BUDDY_TICKER) {
2381 BuddyTickerSetPixmap(b->name, pm, bm); 2381 BuddyTickerSetPixmap(b->name, pm, bm);
2382 gtk_timeout_add(10000, (GtkFunction)BuddyTickerLogoutTimeout, b->name); 2382 gtk_timeout_add(10000, (GtkFunction)BuddyTickerLogoutTimeout, b->name);
2383 } 2383 }
2384 gdk_pixmap_unref(pm); 2384 gdk_pixmap_unref(pm);
2385 gdk_bitmap_unref(bm); 2385 gdk_bitmap_unref(bm);
2386 if ((bs->sound != 1) && (display_options & OPT_DISP_SHOW_LOGON)) { 2386 if ((bs->sound != 1) && (im_options & OPT_IM_LOGON)) {
2387 struct conversation *c = find_conversation(b->name); 2387 struct conversation *c = find_conversation(b->name);
2388 if (c) { 2388 if (c) {
2389 char tmp[1024]; 2389 char tmp[1024];
2390 g_snprintf(tmp, sizeof(tmp), _("%s logged out."), b->name); 2390 g_snprintf(tmp, sizeof(tmp), _("%s logged out."), b->name);
2391 write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time((time_t)NULL)); 2391 write_to_conv(c, tmp, WFLAG_SYSTEM, NULL, time((time_t)NULL));
2529 chatbutton = gtk_button_new_with_label(_("Chat")); 2529 chatbutton = gtk_button_new_with_label(_("Chat"));
2530 awaybutton = gtk_button_new_with_label(_("Away")); 2530 awaybutton = gtk_button_new_with_label(_("Away"));
2531 2531
2532 imchatbox = gtk_hbox_new(TRUE, 10); 2532 imchatbox = gtk_hbox_new(TRUE, 10);
2533 2533
2534 if (display_options & OPT_DISP_COOL_LOOK) 2534 if (misc_options & OPT_MISC_COOL_LOOK)
2535 { 2535 {
2536 gtk_button_set_relief(GTK_BUTTON(imbutton), GTK_RELIEF_NONE); 2536 gtk_button_set_relief(GTK_BUTTON(imbutton), GTK_RELIEF_NONE);
2537 gtk_button_set_relief(GTK_BUTTON(infobutton), GTK_RELIEF_NONE); 2537 gtk_button_set_relief(GTK_BUTTON(infobutton), GTK_RELIEF_NONE);
2538 gtk_button_set_relief(GTK_BUTTON(chatbutton), GTK_RELIEF_NONE); 2538 gtk_button_set_relief(GTK_BUTTON(chatbutton), GTK_RELIEF_NONE);
2539 gtk_button_set_relief(GTK_BUTTON(awaybutton), GTK_RELIEF_NONE); 2539 gtk_button_set_relief(GTK_BUTTON(awaybutton), GTK_RELIEF_NONE);
2779 gtk_widget_show(sw); 2779 gtk_widget_show(sw);
2780 2780
2781 gtk_box_pack_start(GTK_BOX(buddypane), sw, TRUE, TRUE, 0); 2781 gtk_box_pack_start(GTK_BOX(buddypane), sw, TRUE, TRUE, 0);
2782 gtk_widget_show(buddypane); 2782 gtk_widget_show(buddypane);
2783 2783
2784 if (!(display_options & OPT_DISP_NO_BUTTONS)) 2784 if (!(blist_options & OPT_BLIST_NO_BUTTONS))
2785 build_imchat_box(TRUE); 2785 build_imchat_box(TRUE);
2786 2786
2787 2787
2788 /* Swing the edit buddy */ 2788 /* Swing the edit buddy */
2789 editpane = gtk_vbox_new(FALSE, 1); 2789 editpane = gtk_vbox_new(FALSE, 1);
2790 2790
2791 addbutton = gtk_button_new_with_label(_("Add")); 2791 addbutton = gtk_button_new_with_label(_("Add"));
2792 groupbutton = gtk_button_new_with_label(_("Group")); 2792 groupbutton = gtk_button_new_with_label(_("Group"));
2793 rembutton = gtk_button_new_with_label(_("Remove")); 2793 rembutton = gtk_button_new_with_label(_("Remove"));
2794 2794
2795 if (display_options & OPT_DISP_COOL_LOOK) 2795 if (misc_options & OPT_MISC_COOL_LOOK) {
2796 {
2797 gtk_button_set_relief(GTK_BUTTON(addbutton), GTK_RELIEF_NONE); 2796 gtk_button_set_relief(GTK_BUTTON(addbutton), GTK_RELIEF_NONE);
2798 gtk_button_set_relief(GTK_BUTTON(groupbutton), GTK_RELIEF_NONE); 2797 gtk_button_set_relief(GTK_BUTTON(groupbutton), GTK_RELIEF_NONE);
2799 gtk_button_set_relief(GTK_BUTTON(rembutton), GTK_RELIEF_NONE); 2798 gtk_button_set_relief(GTK_BUTTON(rembutton), GTK_RELIEF_NONE);
2800 } 2799 }
2801 2800
2888 GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC); 2887 GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
2889 2888
2890 2889
2891 gtk_window_set_title(GTK_WINDOW(blist), _("Gaim - Buddy List")); 2890 gtk_window_set_title(GTK_WINDOW(blist), _("Gaim - Buddy List"));
2892 2891
2893 if (general_options & OPT_GEN_SAVED_WINDOWS) { 2892 if (blist_options & OPT_BLIST_SAVED_WINDOWS) {
2894 if (blist_pos.width != 0) { /* Sanity check! */ 2893 if (blist_pos.width != 0) { /* Sanity check! */
2895 gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff, 2894 gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff,
2896 blist_pos.y - blist_pos.yoff); 2895 blist_pos.y - blist_pos.yoff);
2897 gtk_widget_set_usize(blist, blist_pos.width, blist_pos.height); 2896 gtk_widget_set_usize(blist, blist_pos.width, blist_pos.height);
2898 } 2897 }