# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 955527202 0
# Node ID 55faf2e3a134851f664b3d8e2c3df0a7ae27f61c
# Parent  e05e6373ea5a1a6b87dc546496d9ca8108f9740c
[gaim-migrate @ 117]
Fixed a really annoying bug so that now the buddy list stays on the panel
and doesn't 'float' when the lag-o-meter is on.

committer: Tailor Script <tailor@pidgin.im>

diff -r e05e6373ea5a -r 55faf2e3a134 src/aim.c
--- a/src/aim.c	Wed Apr 12 06:51:37 2000 +0000
+++ b/src/aim.c	Wed Apr 12 08:13:22 2000 +0000
@@ -145,7 +145,7 @@
 	 applet_widget_register_callback(APPLET_WIDGET(applet),
 			 "buddy",
 			 _("Buddy List"),
-			 (AppletCallbackFunc)make_buddy,
+			 (AppletCallbackFunc)createOnlinePopup,
 			 NULL);
 	 applet_widget_register_callback(APPLET_WIDGET(applet),
 			 "signoff",
diff -r e05e6373ea5a -r 55faf2e3a134 src/away.c
--- a/src/away.c	Wed Apr 12 06:51:37 2000 +0000
+++ b/src/away.c	Wed Apr 12 08:13:22 2000 +0000
@@ -56,7 +56,7 @@
 	        applet_widget_register_callback(APPLET_WIDGET(applet),
         	        "buddy",
                 	_("Buddy List"),
-      		        (AppletCallbackFunc)make_buddy,
+      		        (AppletCallbackFunc)createOnlinePopup,
                 	NULL);
 	}
   MRI_user_status = online;
@@ -90,7 +90,7 @@
         if(!blist) applet_widget_register_callback(APPLET_WIDGET(applet),
                                                    "buddy",
                                                    _("Buddy List"),
-                                                   (AppletCallbackFunc)make_buddy,
+                                                   (AppletCallbackFunc)createOnlinePopup,
                                                    NULL);
         applet_widget_register_callback(APPLET_WIDGET(applet),
                                         "away",
diff -r e05e6373ea5a -r 55faf2e3a134 src/buddy.c
--- a/src/buddy.c	Wed Apr 12 06:51:37 2000 +0000
+++ b/src/buddy.c	Wed Apr 12 08:13:22 2000 +0000
@@ -276,7 +276,7 @@
 	applet_widget_register_callback(APPLET_WIDGET(applet),
 			"buddy",
 			_("Buddy List"),
-			(AppletCallbackFunc)make_buddy,
+			(AppletCallbackFunc)createOnlinePopup,
 			NULL);
 	return (TRUE);
 }
@@ -294,7 +294,14 @@
 }
 
 GtkRequisition gnome_buddy_get_dimentions(){
-	return blist->requisition;
+	if (general_options & OPT_GEN_SAVED_WINDOWS) {
+		GtkRequisition r;
+		r.width = blist_pos.width;
+		r.height = blist_pos.height;
+		return r;
+	} else {
+		return blist->requisition;
+	}
 }
 
 #endif
diff -r e05e6373ea5a -r 55faf2e3a134 src/gaim.h
--- a/src/gaim.h	Wed Apr 12 06:51:37 2000 +0000
+++ b/src/gaim.h	Wed Apr 12 08:13:22 2000 +0000
@@ -290,7 +290,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 104 $"
+#define REVISION "gaim:$Revision: 117 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -547,7 +547,7 @@
 extern void set_login_progress(int, char *);
 extern void show_login();
 #ifdef USE_APPLET
-extern void make_buddy();
+extern void createOnlinePopup();
 extern void applet_show_login(AppletWidget *, gpointer);
 extern void gnome_buddy_show();
 extern void gnome_buddy_hide();
diff -r e05e6373ea5a -r 55faf2e3a134 src/gnome_applet_mgr.c
--- a/src/gnome_applet_mgr.c	Wed Apr 12 06:51:37 2000 +0000
+++ b/src/gnome_applet_mgr.c	Wed Apr 12 08:13:22 2000 +0000
@@ -279,7 +279,7 @@
         applet_widget_register_callback(APPLET_WIDGET(applet),
                 "buddy",
                 _("Buddy List"),
-                (AppletCallbackFunc)make_buddy,
+                (AppletCallbackFunc)createOnlinePopup,
                 NULL);
 	*/
 }
diff -r e05e6373ea5a -r 55faf2e3a134 src/toc.c
--- a/src/toc.c	Wed Apr 12 06:51:37 2000 +0000
+++ b/src/toc.c	Wed Apr 12 08:13:22 2000 +0000
@@ -146,14 +146,13 @@
 
         
 #ifdef USE_APPLET
+	make_buddy();
 	if (general_options & OPT_GEN_APP_BUDDY_SHOW) {
-		make_buddy();
                 gnome_buddy_show();
                 parse_toc_buddy_list(config);
 		createOnlinePopup();
                 set_applet_draw_open();
         } else {
-                make_buddy();
                 gnome_buddy_hide();
                 parse_toc_buddy_list(config);
                 set_applet_draw_closed();