Mercurial > pidgin
changeset 3524:6f9610016503
[gaim-migrate @ 3597]
If I didn't do this, if you turned queuing on in the docklet, and then
unloaded the docklet--you'd never get IMs ever again.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 16 Sep 2002 20:42:17 +0000 |
| parents | 82180bb28f1f |
| children | 1c5d35f767c5 |
| files | src/buddy.c src/server.c src/ui.h |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buddy.c Mon Sep 16 19:50:52 2002 +0000 +++ b/src/buddy.c Mon Sep 16 20:42:17 2002 +0000 @@ -110,7 +110,7 @@ }; static GSList *shows = NULL; -static int docklet_count = 0; +int docklet_count = 0; /* Predefine some functions */ static void new_bp_callback(GtkWidget *w, struct buddy *bs);
--- a/src/server.c Mon Sep 16 19:50:52 2002 +0000 +++ b/src/server.c Mon Sep 16 20:42:17 2002 +0000 @@ -691,10 +691,10 @@ if (new_conv && (sound_options & OPT_SOUND_FIRST_RCV)) play_sound(SND_FIRST_RECEIVE); - else if (cnv && cnv->makesound) + else if (new_conv || cnv->makesound) play_sound(SND_RECEIVE); - if (away_options & OPT_AWAY_QUEUE_UNREAD && !find_conversation(name)) { + if (away_options & OPT_AWAY_QUEUE_UNREAD && !find_conversation(name) && docklet_count) { /* We're gonna queue it up and wait for the user to ask for it... probably * by clicking the docklet or windows tray icon. */ struct queued_message *qm;
--- a/src/ui.h Mon Sep 16 19:50:52 2002 +0000 +++ b/src/ui.h Mon Sep 16 20:42:17 2002 +0000 @@ -276,6 +276,7 @@ extern GtkWidget *buddies; extern GtkWidget *bpmenu; extern GtkWidget *blist; +extern int docklet_count; /* Globals in buddy_chat.c */ extern GList *chats; /* list of all chats (only use for tabbing!) */