# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 1036513284 0
# Node ID 22ed8423a96425576e99ed045b606d1ac0459e82
# Parent  7740c891537e7db78d49dcffb67184ef987fbf2c
[gaim-migrate @ 4055]
I don't like this.

committer: Tailor Script <tailor@pidgin.im>

diff -r 7740c891537e -r 22ed8423a964 src/buddy.c
--- a/src/buddy.c	Tue Nov 05 05:20:48 2002 +0000
+++ b/src/buddy.c	Tue Nov 05 16:21:24 2002 +0000
@@ -2508,12 +2508,10 @@
 
 		imchatbox = gtk_hbox_new(TRUE, 10);
 
-		if (misc_options & OPT_MISC_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);
-			gtk_button_set_relief(GTK_BUTTON(awaybutton), GTK_RELIEF_NONE);
-		}
+		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);
+		gtk_button_set_relief(GTK_BUTTON(awaybutton), GTK_RELIEF_NONE);
 
 		/* Put the buttons in the hbox */
 		gtk_widget_show(imbutton);
@@ -2738,11 +2736,9 @@
 	groupbutton = gtk_button_new_with_label(_("Group"));
 	rembutton = gtk_button_new_with_label(_("Remove"));
 
-	if (misc_options & OPT_MISC_COOL_LOOK) {
-		gtk_button_set_relief(GTK_BUTTON(addbutton), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(groupbutton), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(rembutton), GTK_RELIEF_NONE);
-	}
+	gtk_button_set_relief(GTK_BUTTON(addbutton), GTK_RELIEF_NONE);
+	gtk_button_set_relief(GTK_BUTTON(groupbutton), GTK_RELIEF_NONE);
+	gtk_button_set_relief(GTK_BUTTON(rembutton), GTK_RELIEF_NONE);
 
 	gtk_box_pack_start(GTK_BOX(bbox), addbutton, TRUE, TRUE, 0);
 	gtk_box_pack_start(GTK_BOX(bbox), groupbutton, TRUE, TRUE, 0);
diff -r 7740c891537e -r 22ed8423a964 src/dialogs.c
--- a/src/dialogs.c	Tue Nov 05 05:20:48 2002 +0000
+++ b/src/dialogs.c	Tue Nov 05 16:21:24 2002 +0000
@@ -4660,8 +4660,6 @@
 	GtkWidget *pixmap;
 
 	button = gtk_button_new();
-	if (misc_options & OPT_MISC_COOL_LOOK)
-		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 
 	button_box = gtk_hbox_new(FALSE, 5);
 	gtk_container_add(GTK_CONTAINER(button), button_box);
@@ -4706,9 +4704,8 @@
 
 	if (!button_tips)
 		button_tips = gtk_tooltips_new();
+
 	button = gtk_button_new();
-	if (misc_options & OPT_MISC_COOL_LOOK)
-		gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
 
 	button_box = gtk_hbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(button), button_box);
diff -r 7740c891537e -r 22ed8423a964 src/gaim.h
--- a/src/gaim.h	Tue Nov 05 05:20:48 2002 +0000
+++ b/src/gaim.h	Tue Nov 05 16:21:24 2002 +0000
@@ -207,7 +207,6 @@
 #define OPT_MISC_DEBUG			0x00000001
 #define OPT_MISC_BROWSER_POPUP		0x00000002
 #define OPT_MISC_BUDDY_TICKER           0x00000004
-#define OPT_MISC_COOL_LOOK		0x00000008
 #define OPT_MISC_STEALTH_TYPING         0x00000010
 
 extern guint logging_options;
diff -r 7740c891537e -r 22ed8423a964 src/gaimrc.c
--- a/src/gaimrc.c	Tue Nov 05 05:20:48 2002 +0000
+++ b/src/gaimrc.c	Tue Nov 05 16:21:24 2002 +0000
@@ -699,7 +699,6 @@
 { /* OPT_DISP_IGNORE_COLOUR */		0x00000020, &convo_options, OPT_CONVO_IGNORE_COLOUR },
 { /* OPT_DISP_SHOW_LOGON */		0x00000040,    &im_options, OPT_IM_LOGON },
 { /* OPT_DISP_SHOW_SMILEY */		0x00000100, &convo_options, OPT_CONVO_SHOW_SMILEY },
-{ /* OPT_DISP_COOL_LOOK */		0x00000400,  &misc_options, OPT_MISC_COOL_LOOK },
 { /* OPT_DISP_CHAT_LOGON */		0x00000800,  &chat_options, OPT_CHAT_LOGON },
 { /* OPT_DISP_NO_BUTTONS */		0x00002000, &blist_options, OPT_BLIST_NO_BUTTONS },
 { /* OPT_DISP_CONV_BUTTON_TEXT */	0x00004000,    &im_options, OPT_IM_BUTTON_TEXT },
@@ -1126,7 +1125,7 @@
 	int i;
 	struct away_message *a;
 
-	misc_options = OPT_MISC_COOL_LOOK;
+	misc_options = 0; 
 
 	logging_options = 0;
 
diff -r 7740c891537e -r 22ed8423a964 src/prefs.c
--- a/src/prefs.c	Tue Nov 05 05:20:48 2002 +0000
+++ b/src/prefs.c	Tue Nov 05 16:21:24 2002 +0000
@@ -176,8 +176,6 @@
 	debugbutton = gaim_button(_("Show _Debug Window"), &misc_options, OPT_MISC_DEBUG, vbox);
 
 
-	gaim_button(_("Use _borderless buttons"), &misc_options, OPT_MISC_COOL_LOOK, vbox);
-
 	gtk_widget_show_all(ret);
 	return ret;
 }