Mercurial > pidgin.yaz
changeset 1591:5c74d8b6cb57
[gaim-migrate @ 1601]
applet fixes for when it's "removed from panel"
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Fri, 16 Mar 2001 10:59:57 +0000 |
| parents | b4e54a752676 |
| children | 41cecde078c1 |
| files | src/applet.c src/away.c src/buddy.c |
| diffstat | 3 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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); }
--- 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) {
--- 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);