Mercurial > pidgin.yaz
changeset 20705:3e85d985d9f0
merge of '27d49044df2da785a519726b37211c6c5218bc41'
and '6a82d40bc7eedd0f5990f952ce1cfc7d194eabdb'
| author | William Ehlhardt <williamehlhardt@gmail.com> |
|---|---|
| date | Sat, 29 Sep 2007 04:59:50 +0000 |
| parents | d6fb31898506 (current diff) 8a830c4ce996 (diff) |
| children | 370cb5fd5586 |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkpounce.c Sat Sep 29 04:24:05 2007 +0000 +++ b/pidgin/gtkpounce.c Sat Sep 29 04:59:50 2007 +0000 @@ -306,6 +306,13 @@ if (*command == '\0') command = NULL; if (*sound == '\0') sound = NULL; + /* If the pounce has already been triggered, let's pretend it is a new one */ + if (dialog->pounce != NULL + && g_list_find(purple_pounces_get_all(), dialog->pounce) == NULL) { + purple_debug_info("gtkpounce", "Saving pounce that no longer exists; creating new pounce.\n"); + dialog->pounce = NULL; + } + if (dialog->pounce == NULL) { dialog->pounce = purple_pounce_new(PIDGIN_UI, dialog->account,