changeset 535:f03f041c1aa9

[gaim-migrate @ 545] fflewddur wrote a really cool patch to make buttons borderless, like the buttons in winaim. of course, unlike winaim, it's optional. :) committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Thu, 27 Jul 2000 17:48:15 +0000
parents d7cdcd9e28f4
children c9f994ea5833
files src/about.c src/aim.c src/away.c src/buddy.c src/buddy_chat.c src/conversation.c src/dialogs.c src/gaim.h src/oscar.c src/plugins.c src/prefs.c src/rvous.c src/server.c
diffstat 13 files changed, 230 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/about.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/about.c	Thu Jul 27 17:48:15 2000 +0000
@@ -114,7 +114,10 @@
                                           GTK_SIGNAL_FUNC(destroy_about), GTK_OBJECT(about));
                 gtk_signal_connect(GTK_OBJECT(about), "destroy",
                                    GTK_SIGNAL_FUNC(destroy_about), GTK_OBJECT(about));
- 
+ 		
+ 		if (display_options & OPT_DISP_COOL_LOOK)
+ 			gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+ 			
 		GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 		gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, FALSE, 0);
 		gtk_widget_grab_default(button);
--- a/src/aim.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/aim.c	Thu Jul 27 17:48:15 2000 +0000
@@ -356,6 +356,15 @@
 
         gtk_combo_set_popdown_strings(GTK_COMBO(name), combo_user_names());
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(signon), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(reg), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(options), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(plugs), GTK_RELIEF_NONE);
+	}
+
 	/* Make the buttons do stuff */
 	/* Clicking the button initiates a login */
 	gtk_signal_connect(GTK_OBJECT(signon), "clicked",
--- a/src/away.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/away.c	Thu Jul 27 17:48:15 2000 +0000
@@ -124,6 +124,8 @@
 		gtk_text_insert(GTK_TEXT(awaytext), NULL, NULL, NULL, buf, -1);
 		gtk_widget_show(awaytext);
                 
+		if (display_options & OPT_DISP_COOL_LOOK)
+			gtk_button_set_relief(GTK_BUTTON(back), GTK_RELIEF_NONE);
 		
 		/* Put the buttons in the box */
 		gtk_box_pack_start(GTK_BOX(bbox), back, TRUE, TRUE, 10);
--- a/src/buddy.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/buddy.c	Thu Jul 27 17:48:15 2000 +0000
@@ -1988,9 +1988,12 @@
 	buddies    = gtk_tree_new();
 	sw         = gtk_scrolled_window_new(NULL, NULL);
 	
-
-
-
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(imbutton), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(infobutton), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(chatbutton), GTK_RELIEF_NONE);
+	}
         
 	tips = gtk_tooltips_new();
 	gtk_object_set_data(GTK_OBJECT(blist), _("Buddy List"), tips);
@@ -2034,6 +2037,13 @@
         
        	addbutton = gtk_button_new_with_label(_("Add"));
        	rembutton = gtk_button_new_with_label(_("Remove"));
+	
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(addbutton), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(rembutton), GTK_RELIEF_NONE);
+	}
+	
 	edittree = gtk_ctree_new(1, 0);
 	gtk_ctree_set_line_style (GTK_CTREE(edittree), GTK_CTREE_LINES_SOLID);
         gtk_ctree_set_expander_style(GTK_CTREE(edittree), GTK_CTREE_EXPANDER_SQUARE);
@@ -2104,6 +2114,12 @@
         addpermbutton = gtk_button_new_with_label(_("Add"));
         rempermbutton = gtk_button_new_with_label(_("Remove"));
         
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(addpermbutton), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(rempermbutton), GTK_RELIEF_NONE);
+	}
+	
        	permtree = gtk_tree_new();
 	build_permit_tree();
        	pbox = gtk_hbox_new(TRUE, 10);
--- a/src/buddy_chat.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/buddy_chat.c	Thu Jul 27 17:48:15 2000 +0000
@@ -143,6 +143,12 @@
 	gtk_widget_set_usize(cancel, 75, 30);
 
         /* End of Cancel Button */
+        
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(join), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
+	}
 
 	gtk_box_pack_start(GTK_BOX(bbox), join, FALSE, FALSE, 5);
 	gtk_box_pack_end(GTK_BOX(bbox), cancel, FALSE, FALSE, 5);
@@ -227,6 +233,12 @@
 		inviteentry = gtk_entry_new();
 		invitemess = gtk_entry_new();
 
+		if (display_options & OPT_DISP_COOL_LOOK)
+		{
+			gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
+			gtk_button_set_relief(GTK_BUTTON(invite_btn), GTK_RELIEF_NONE);
+		}
+
 		/* Put the buttons in the box */
 		gtk_box_pack_start(GTK_BOX(bbox), invite_btn, TRUE, TRUE, 10);
 		gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 10);
@@ -550,6 +562,17 @@
         ignore = gtk_button_new_with_label(_("Ignore"));
         info = gtk_button_new_with_label(_("Info"));
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(invite_btn), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(whisper), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(send), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(im), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(ignore), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(info), GTK_RELIEF_NONE);
+	}
+	
 	text = gtk_html_new(NULL, NULL);
 	
 	b->text = text;
--- a/src/conversation.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/conversation.c	Thu Jul 27 17:48:15 2000 +0000
@@ -1282,7 +1282,24 @@
 	else
 		gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(wood), FALSE);
         state_lock = 0;
-        
+
+	/* use a slicker look if the user wants to */
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(strike), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(normal), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(big), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(bold), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(italic), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(underline), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(speaker), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(wood), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(palette), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(link), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(font), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(small), GTK_RELIEF_NONE);
+	}
+	
 	gtk_widget_show(toolbar);
 	
 	c->bold = bold;
@@ -1347,7 +1364,17 @@
 	}
         block = gtk_button_new_with_label(_("Block"));
 
-
+	/* use a slicker look if the user wants to */
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(send), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(info), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(warn), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(add), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(block), GTK_RELIEF_NONE);
+	}
+	
         bbox = gtk_hbox_new(TRUE, 0);
 	vbox = gtk_vbox_new(FALSE, 0);
 	vbox2 = gtk_vbox_new(FALSE, 0);
--- a/src/dialogs.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/dialogs.c	Thu Jul 27 17:48:15 2000 +0000
@@ -382,14 +382,12 @@
 	gtk_window_set_policy(GTK_WINDOW(w->window), FALSE, FALSE, TRUE);
 	gtk_widget_show(w->window);
 	dialogwindows = g_list_prepend(dialogwindows, w->window);
-        cancel = gtk_button_new_with_label(_("Cancel"));
-        warn = gtk_button_new_with_label(_("Warn"));
         bbox = gtk_hbox_new(TRUE, 10);
         vbox = gtk_vbox_new(FALSE, 5);
 	fbox = gtk_vbox_new(FALSE, 5);
 
 	frame = gtk_frame_new(_("Warn"));
-
+	
 	/* Build Warn Button */
 
 	warn = gtk_button_new();
@@ -434,7 +432,15 @@
 	gtk_container_add(GTK_CONTAINER(cancel), button_box);
 	
 	/* End of Cancel Button */
-        /* Put the buttons in the box */
+
+
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(warn), GTK_RELIEF_NONE);
+	}
+	
+	/* Put the buttons in the box */
 
 	gtk_widget_set_usize(warn, 75, 30);
 	gtk_widget_set_usize(cancel, 75, 30);
@@ -536,6 +542,10 @@
 
 	/* End of Close Button */
 
+
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE);
+	
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->action_area), 
 		close, FALSE, FALSE, 5);
 
@@ -701,6 +711,10 @@
         ok = gtk_button_new_with_label(_("OK"));
         box = gtk_vbox_new(FALSE, 10);
 
+
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(ok), GTK_RELIEF_NONE);
+	
 	if (ee == 0)
 		label = gtk_label_new("Amazing!  Simply Amazing!");
 	else if (ee == 1)
@@ -786,6 +800,9 @@
 
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);	
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+		
 	gtk_widget_set_usize(button, 75, 30);
 	gtk_widget_show(button);
 
@@ -817,6 +834,9 @@
 
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);	
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+		
 	gtk_widget_set_usize(button, 75, 30);
 	gtk_widget_show(button);
 
@@ -949,6 +969,9 @@
 
 	add = gtk_button_new();
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(add), GTK_RELIEF_NONE);
+		
 	button_box = gtk_hbox_new(FALSE, 5);
 	icon = gdk_pixmap_create_from_xpm_d ( a->window->window, &mask, NULL, add_xpm);
 	icon_i = gtk_pixmap_new(icon, mask);
@@ -971,6 +994,9 @@
 
 	cancel = gtk_button_new();
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
+		
 	button_box = gtk_hbox_new(FALSE, 5);
 	icon = gdk_pixmap_create_from_xpm_d ( a->window->window, &mask, NULL, cancel_xpm);
 	icon_i = gtk_pixmap_new(icon, mask);
@@ -1125,6 +1151,9 @@
 
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);	
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+		
 	gtk_widget_set_usize(button, 75, 30);
 	gtk_widget_show(button);
 
@@ -1155,6 +1184,9 @@
 
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);	
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+		
 	gtk_widget_set_usize(button, 75, 30);
 	gtk_widget_show(button);
 
@@ -1302,6 +1334,9 @@
 	gtk_widget_show(label);
 	gtk_widget_show(icon_i);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(b->save), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button_box);
 
 	gtk_container_add(GTK_CONTAINER(b->save), button_box);
@@ -1324,6 +1359,9 @@
 	gtk_widget_show(label);
 	gtk_widget_show(icon_i);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(b->cancel), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button_box);
 
 	gtk_container_add(GTK_CONTAINER(b->cancel), button_box);
@@ -1538,6 +1576,9 @@
 	gtk_widget_show(label);
 	gtk_widget_show(icon_i);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(b->ok), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button_box);
 
 	gtk_container_add(GTK_CONTAINER(b->ok), button_box);
@@ -1560,6 +1601,9 @@
 	gtk_widget_show(label);
 	gtk_widget_show(icon_i);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(b->cancel), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button_box);
 
 	gtk_container_add(GTK_CONTAINER(b->cancel), button_box);
@@ -1692,6 +1736,9 @@
 	gtk_widget_show(label);
 	gtk_widget_show(icon_i);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(b->save), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button_box);
 
 	gtk_container_add(GTK_CONTAINER(b->save), button_box);
@@ -1714,6 +1761,9 @@
 	gtk_widget_show(label);
 	gtk_widget_show(icon_i);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(b->cancel), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button_box);
 
 	gtk_container_add(GTK_CONTAINER(b->cancel), button_box);
@@ -1847,6 +1897,12 @@
 	gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 5);
 	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(ok), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
+	}
+	
 	gtk_signal_connect(GTK_OBJECT(b->window), "destroy",
 			   GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 	gtk_signal_connect(GTK_OBJECT(cancel), "clicked",
@@ -1901,6 +1957,9 @@
         gtk_signal_connect(GTK_OBJECT(ok), "clicked",
 			   GTK_SIGNAL_FUNC(destroy_dialog), b->window);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(ok), GTK_RELIEF_NONE);
+
         label = gtk_label_new(_("Below are the results of your search: "));
 
 	sw = gtk_scrolled_window_new (NULL, NULL);
@@ -2030,6 +2089,9 @@
 	gtk_widget_show(label);
 	gtk_widget_show(icon_i);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(add), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button_box);
 
 	gtk_container_add(GTK_CONTAINER(add), button_box);
@@ -2053,6 +2115,9 @@
 	gtk_widget_show(label);
 	gtk_widget_show(icon_i);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button_box);
 
 	gtk_container_add(GTK_CONTAINER(cancel), button_box);
@@ -2271,6 +2336,9 @@
 	gtk_widget_show(label);
 	gtk_widget_show(icon_i);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(ok), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button_box);
 
 	gtk_container_add(GTK_CONTAINER(ok), button_box);
@@ -2294,6 +2362,9 @@
 	gtk_widget_show(label);
 	gtk_widget_show(icon_i);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button_box);
 
 	gtk_container_add(GTK_CONTAINER(cancel), button_box);
@@ -2467,6 +2538,9 @@
 
 	button = gtk_button_new();
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+		
 	button_box = gtk_hbox_new(FALSE, 5);
 	icon = gdk_pixmap_create_from_xpm_d ( b->window->window, &mask, NULL, ok_xpm);
 	icon_i = gtk_pixmap_new(icon, mask);
@@ -2518,6 +2592,9 @@
 
 	gtk_box_pack_start(GTK_BOX(bbox), button, FALSE, FALSE, 5);	
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+		
 	gtk_widget_set_usize(button, 75, 30);
 	gtk_widget_show(button);
 
@@ -2598,7 +2675,13 @@
 
 		b->cancel = gtk_button_new_with_label(_("Cancel"));
 		b->ok = gtk_button_new_with_label(_("Ok"));
-	
+
+		if (display_options & OPT_DISP_COOL_LOOK)
+		{
+			gtk_button_set_relief(GTK_BUTTON(b->cancel), GTK_RELIEF_NONE);
+			gtk_button_set_relief(GTK_BUTTON(b->ok), GTK_RELIEF_NONE);
+		}
+			
 		vbox = gtk_vbox_new(FALSE, 10);
 		bbox = gtk_hbox_new(TRUE, 10);
 
@@ -3210,6 +3293,10 @@
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(create_mess), ca);
 	gtk_widget_show(button_box);
 	gtk_container_add(GTK_CONTAINER(button), button_box);
+	
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+
 	gtk_widget_show(button);
 
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 5);
@@ -3233,6 +3320,10 @@
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(destroy_dialog), ca->window);
 	gtk_widget_show(button_box);
 	gtk_container_add(GTK_CONTAINER(button), button_box);
+
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+		
 	gtk_widget_show(button);
 
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 5);
--- a/src/gaim.h	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/gaim.h	Thu Jul 27 17:48:15 2000 +0000
@@ -382,7 +382,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 537 $"
+#define REVISION "gaim:$Revision: 545 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -474,6 +474,7 @@
 #define OPT_DISP_DEVIL_PIXMAPS   0x00000080
 #define OPT_DISP_SHOW_SMILEY	 0x00000100
 #define OPT_DISP_SHOW_BUDDYTICKER	 0x00000200
+#define OPT_DISP_COOL_LOOK			0x00000400
  
 extern int sound_options;
 #define OPT_SOUND_LOGIN          0x00000001
--- a/src/oscar.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/oscar.c	Thu Jul 27 17:48:15 2000 +0000
@@ -621,6 +621,8 @@
 	yes = gtk_button_new();
 	gtk_box_pack_start(GTK_BOX(hbox), yes, FALSE, FALSE, 5);
 	gtk_widget_show(yes);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(yes), GTK_RELIEF_NONE);
 
 	button = gtk_hbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(yes), button);
@@ -638,6 +640,8 @@
 	no = gtk_button_new();
 	gtk_box_pack_end(GTK_BOX(hbox), no, FALSE, FALSE, 5);
 	gtk_widget_show(no);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(no), GTK_RELIEF_NONE);
 
 	button = gtk_hbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(no), button);
--- a/src/plugins.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/plugins.c	Thu Jul 27 17:48:15 2000 +0000
@@ -294,20 +294,28 @@
 	gtk_signal_connect(GTK_OBJECT(add), "clicked",
 			   GTK_SIGNAL_FUNC(load_file), NULL);
 	gtk_box_pack_start(GTK_BOX(botbox), add, TRUE, FALSE, 5);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(add), GTK_RELIEF_NONE);
 
 	config = gtk_button_new_with_label(_("Configure Plugin"));
 	gtk_widget_set_sensitive(config, 0);
 	gtk_box_pack_start(GTK_BOX(botbox), config, TRUE, FALSE, 5);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(config), GTK_RELIEF_NONE);
 
 	remove = gtk_button_new_with_label(_("Unload Plugin"));
 	gtk_signal_connect(GTK_OBJECT(remove), "clicked",
 			   GTK_SIGNAL_FUNC(unload), pluglist);
 	gtk_box_pack_start(GTK_BOX(botbox), remove, TRUE, FALSE, 5);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(remove), GTK_RELIEF_NONE);
 
 	close = gtk_button_new_with_label(_("Close"));
 	gtk_signal_connect(GTK_OBJECT(close), "clicked",
 			   GTK_SIGNAL_FUNC(hide_plugins), NULL);
 	gtk_box_pack_start(GTK_BOX(botbox), close, TRUE, FALSE, 5);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE);
 
 	gtk_box_pack_start(GTK_BOX(page), topbox, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(page), botbox, FALSE, FALSE, 0);
--- a/src/prefs.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/prefs.c	Thu Jul 27 17:48:15 2000 +0000
@@ -622,10 +622,14 @@
 	gtk_text_set_editable(GTK_TEXT(pd->away_text), TRUE );
 
 	add_away = gtk_button_new_with_label(_("Create Message"));
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(add_away), GTK_RELIEF_NONE);
 	gtk_signal_connect(GTK_OBJECT(add_away), "clicked", GTK_SIGNAL_FUNC(create_away_mess), NULL);
 	gtk_box_pack_start(GTK_BOX(away_botbox), add_away, TRUE, FALSE, 5);
 
 	remove_away = gtk_button_new_with_label(_("Remove Message"));
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(remove_away), GTK_RELIEF_NONE);
 	gtk_signal_connect(GTK_OBJECT(remove_away), "clicked", GTK_SIGNAL_FUNC(remove_away_message), NULL);
 	gtk_box_pack_start(GTK_BOX(away_botbox), remove_away, TRUE, FALSE, 5);
 
@@ -772,6 +776,7 @@
 	gaim_button(_("Use devil icons"), &display_options, OPT_DISP_DEVIL_PIXMAPS, appbox );
 	gaim_button(_("Show graphical smileys (experimental)"), &display_options, OPT_DISP_SHOW_SMILEY, appbox );
 	gaim_button(_("Show Buddy Ticker after restart"), &display_options, OPT_DISP_SHOW_BUDDYTICKER, appbox );
+	gaim_button(_("Use borderless buttons (requires restart for some buttons)"), &display_options, OPT_DISP_COOL_LOOK, appbox);
 	
 	
 	gaim_button(_("Bold Text"), &font_options, OPT_FONT_BOLD, fontbox);
@@ -781,6 +786,8 @@
 	font_face_for_text = gaim_button(_("Font Face for Text"), &font_options, OPT_FONT_FACE, fontbox);
 		
 	select_font = gtk_button_new_with_label(_("Select Font"));
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(select_font), GTK_RELIEF_NONE);
 	gtk_box_pack_start(GTK_BOX(fontbox), select_font, FALSE, FALSE, 0);
 	gtk_signal_connect(GTK_OBJECT(select_font), "clicked", GTK_SIGNAL_FUNC(show_font_dialog), NULL);
 	if (!(font_options & OPT_FONT_FACE))
@@ -806,6 +813,8 @@
 	
 	bbox = gtk_hbox_new(FALSE, 5);
 	close = gtk_button_new_with_label(_("Close"));
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE);
 	
 	/* Pack the button(s) in the button box */
 	gtk_box_pack_end(GTK_BOX(bbox), close, FALSE, FALSE, 5);
@@ -997,6 +1006,12 @@
 	ref_button = gtk_button_new_with_label(_("Refresh"));
 	add_button = gtk_button_new_with_label(_("Add"));
 	rem_button = gtk_button_new_with_label(_("Remove"));
+	if (display_options & OPT_DISP_COOL_LOOK)
+	{
+		gtk_button_set_relief(GTK_BUTTON(ref_button), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(add_button), GTK_RELIEF_NONE);
+		gtk_button_set_relief(GTK_BUTTON(rem_button), GTK_RELIEF_NONE);
+	}
 	gtk_widget_show(list1);
 	gtk_widget_show(sw1);
 	gtk_widget_show(list2);
--- a/src/rvous.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/rvous.c	Thu Jul 27 17:48:15 2000 +0000
@@ -279,6 +279,8 @@
 	button = gtk_button_new_with_label(_("Cancel"));
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->action_area), button, 0, 0, 5);
 	gtk_widget_show(button);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc)toggle, &cont);
 	gtk_window_set_title(GTK_WINDOW(fw), _("Gaim - File Transfer"));
 	gtk_widget_realize(fw);
@@ -414,6 +416,8 @@
 	button = gtk_button_new_with_label(_("Cancel"));
 	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(fw)->action_area), button, 0, 0, 5);
 	gtk_widget_show(button);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", (GtkSignalFunc)toggle, &cont);
 	gtk_window_set_title(GTK_WINDOW(fw), _("Gaim - File Transfer"));
 	gtk_widget_realize(fw);
@@ -640,6 +644,15 @@
         gtk_widget_show(warn);
         gtk_widget_show(cancel);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(accept), GTK_RELIEF_NONE);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(info), GTK_RELIEF_NONE);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(warn), GTK_RELIEF_NONE);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(cancel), GTK_RELIEF_NONE);
+
         gtk_box_pack_start(GTK_BOX(bbox), accept, TRUE, TRUE, 10);
         gtk_box_pack_start(GTK_BOX(bbox), info, TRUE, TRUE, 10);
         gtk_box_pack_start(GTK_BOX(bbox), warn, TRUE, TRUE, 10);
--- a/src/server.c	Thu Jul 27 17:41:36 2000 +0000
+++ b/src/server.c	Thu Jul 27 17:48:15 2000 +0000
@@ -877,6 +877,8 @@
         label = gtk_label_new(buf2);
         gtk_widget_show(label);
         close = gtk_button_new_with_label("Close");
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(close), GTK_RELIEF_NONE);
         gtk_widget_show(close);
         gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->vbox),
                            label, FALSE, FALSE, 5);
@@ -958,6 +960,10 @@
         gtk_box_pack_start(GTK_BOX(GTK_DIALOG(d)->action_area),
                            nobtn, FALSE, FALSE, 5);
 
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(yesbtn), GTK_RELIEF_NONE);
+	if (display_options & OPT_DISP_COOL_LOOK)
+		gtk_button_set_relief(GTK_BUTTON(nobtn), GTK_RELIEF_NONE);
 
         /*		gtk_widget_set_usize(d, 200, 110); */