# HG changeset patch # User Eric Warmenhoven # Date 984740397 0 # Node ID 5c74d8b6cb57c5733ebf0009019e1ae33a6be462 # Parent b4e54a7526767e4172d7b8d0931d048cbb08f331 [gaim-migrate @ 1601] applet fixes for when it's "removed from panel" committer: Tailor Script diff -r b4e54a752676 -r 5c74d8b6cb57 src/applet.c --- a/src/applet.c Fri Mar 16 09:37:44 2001 +0000 +++ b/src/applet.c Fri Mar 16 10:59:57 2001 +0000 @@ -201,6 +201,9 @@ struct away_message *a; char *awayname; + if (!applet) + return; + applet_widget_unregister_callback(APPLET_WIDGET(applet), "away/new"); while (awy) { @@ -398,6 +401,8 @@ } void applet_set_tooltips(char *msg) { + if (!applet) + return; applet_widget_set_tooltip(APPLET_WIDGET(applet), msg); } diff -r b4e54a752676 -r 5c74d8b6cb57 src/away.c --- a/src/away.c Fri Mar 16 09:37:44 2001 +0000 +++ b/src/away.c Fri Mar 16 10:59:57 2001 +0000 @@ -222,11 +222,13 @@ #ifdef USE_APPLET remove_applet_away(); - if (imaway) + if (imaway && applet) applet_widget_register_callback(APPLET_WIDGET(applet), "away", _("Back"), (AppletCallbackFunc)do_im_back, NULL); + else if (imaway) + insert_applet_away(); else - insert_applet_away(); + return; #endif if (prefs_away_list != NULL) { diff -r b4e54a752676 -r 5c74d8b6cb57 src/buddy.c --- a/src/buddy.c Fri Mar 16 09:37:44 2001 +0000 +++ b/src/buddy.c Fri Mar 16 10:59:57 2001 +0000 @@ -1121,7 +1121,13 @@ GList *c; struct gaim_plugin *p; void (*gaim_plugin_remove)(); - +#endif + +#ifdef USE_APPLET + applet = NULL; +#endif + +#ifdef GAIM_PLUGINS /* first we tell those who have requested it we're quitting */ plugin_event(event_quit, 0, 0, 0, 0);