Mercurial > pidgin.yaz
changeset 107:55faf2e3a134
[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>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Wed, 12 Apr 2000 08:13:22 +0000 |
| parents | e05e6373ea5a |
| children | 9a544c677ab7 |
| files | src/aim.c src/away.c src/buddy.c src/gaim.h src/gnome_applet_mgr.c src/toc.c |
| diffstat | 6 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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",
--- 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",
--- 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
--- 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();
--- 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); */ }
--- 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();