Mercurial > pidgin.yaz
changeset 1281:83d8b2078f4c
[gaim-migrate @ 1291]
I think i got the applet stuff right finally
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Thu, 14 Dec 2000 23:12:07 +0000 |
| parents | d55aad6e05d9 |
| children | 577b71ae4e2a |
| files | src/applet.c src/away.c |
| diffstat | 2 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/applet.c Thu Dec 14 23:04:29 2000 +0000 +++ b/src/applet.c Thu Dec 14 23:12:07 2000 +0000 @@ -117,7 +117,7 @@ icon_offline_bm ); gtk_label_set( GTK_LABEL(status_label), _MSG_OFFLINE_ ); applet_set_tooltips(_("Offilne. Click to bring up login box.")); - } else if (awaymessage) { /* fucked up, i know */ + } else if (!awaymessage) { gtk_pixmap_set( GTK_PIXMAP(icon), icon_online_pm, icon_online_bm );
--- a/src/away.c Thu Dec 14 23:04:29 2000 +0000 +++ b/src/away.c Thu Dec 14 23:12:07 2000 +0000 @@ -52,11 +52,6 @@ void do_im_back(GtkWidget *w, GtkWidget *x) { -#ifdef USE_APPLET - applet_widget_unregister_callback(APPLET_WIDGET(applet), "away"); - set_user_state(online); - insert_applet_away(); -#endif /* USE_APPLET */ if (imaway) { GtkWidget *tmp = imaway; imaway = NULL; @@ -66,6 +61,11 @@ serv_set_away(NULL); awaymessage = NULL; +#ifdef USE_APPLET + applet_widget_unregister_callback(APPLET_WIDGET(applet), "away"); + set_user_state(online); + insert_applet_away(); +#endif /* USE_APPLET */ } @@ -106,13 +106,6 @@ if (!a) return; -#ifdef USE_APPLET - remove_applet_away(); - applet_widget_register_callback(APPLET_WIDGET(applet), - "away", _("Back"), (AppletCallbackFunc)do_im_back, NULL); - set_user_state(away); -#endif - if (!imaway) { imaway = gtk_window_new(GTK_WINDOW_DIALOG); gtk_window_set_wmclass(GTK_WINDOW(imaway), "imaway", "Gaim"); @@ -166,6 +159,13 @@ return; } +#ifdef USE_APPLET + remove_applet_away(); + applet_widget_register_callback(APPLET_WIDGET(applet), + "away", _("Back"), (AppletCallbackFunc)do_im_back, NULL); + set_user_state(away); +#endif + /* New away message... Clear out the old sent_aways */ while (cnv) { c = (struct conversation *)cnv->data;