# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1000950264 0
# Node ID 64b4c69c1c5e768b22b2ad41f4b28a50c73e6e4a
# Parent  bd9d403fb15b922118cc8b16cb5f7be76e7f47d8
[gaim-migrate @ 2324]
whoops

committer: Tailor Script <tailor@pidgin.im>

diff -r bd9d403fb15b -r 64b4c69c1c5e src/applet.c
--- a/src/applet.c	Thu Sep 20 01:23:04 2001 +0000
+++ b/src/applet.c	Thu Sep 20 01:44:24 2001 +0000
@@ -149,7 +149,7 @@
 extern GtkWidget *mainwindow;
 void applet_show_login(AppletWidget *widget, gpointer data) {
         show_login();
-	if (general_options & OPT_GEN_NEAR_APPLET) {
+	if (blist_options & OPT_BLIST_NEAR_APPLET) {
 		GtkAllocation a = get_applet_pos(FALSE);
 		gtk_widget_set_uposition(mainwindow, a.x, a.y);
 	}
@@ -226,7 +226,7 @@
 
 	gdk_window_get_position(gtk_widget_get_parent_window(appletframe), &x, &y);
 	if (for_blist) {
-	        if (general_options & OPT_GEN_SAVED_WINDOWS) {
+	        if (blist_options & OPT_BLIST_SAVED_WINDOWS) {
 			buddy_req.width = blist_pos.width;
 			buddy_req.height = blist_pos.height;
 		} else {
@@ -263,9 +263,9 @@
 	GtkAllocation al;
 	if (blist) gtk_widget_show(blist);
 	al  = get_applet_pos(TRUE);  
-        if (general_options & OPT_GEN_NEAR_APPLET)
+        if (blist_options & OPT_BLIST_NEAR_APPLET)
                 gtk_widget_set_uposition ( blist, al.x, al.y );
-        else if (general_options & OPT_GEN_SAVED_WINDOWS)
+        else if (blist_options & OPT_BLIST_SAVED_WINDOWS)
                 gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff, blist_pos.y - blist_pos.yoff);
 }
 
diff -r bd9d403fb15b -r 64b4c69c1c5e src/multi.c
--- a/src/multi.c	Thu Sep 20 01:23:04 2001 +0000
+++ b/src/multi.c	Thu Sep 20 01:44:24 2001 +0000
@@ -925,7 +925,7 @@
 		gtk_widget_hide(mainwindow);
 
 #ifdef USE_APPLET
-	if (general_options & OPT_GEN_APP_BUDDY_SHOW) {
+	if (blist_options & OPT_BLIST_APP_BUDDY_SHOW) {
 		show_buddy_list();
 		refresh_buddy_window();
 		createOnlinePopup();
diff -r bd9d403fb15b -r 64b4c69c1c5e src/prefs.c
--- a/src/prefs.c	Thu Sep 20 01:23:04 2001 +0000
+++ b/src/prefs.c	Thu Sep 20 01:44:24 2001 +0000
@@ -559,7 +559,7 @@
 		gtk_widget_set_sensitive(button2, FALSE);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(toggle_sensitive), button2);
 #ifdef USE_APPLET
-	gaim_button(_("Display Buddy List near applet"), &blist_options, OPT_BLSIT_NEAR_APPLET, vbox);
+	gaim_button(_("Display Buddy List near applet"), &blist_options, OPT_BLIST_NEAR_APPLET, vbox);
 #endif
 
 	frame = gtk_frame_new(_("Group Displays"));