Mercurial > pidgin
changeset 20701:8a830c4ce996
propagate from branch 'im.pidgin.pidgin.2.2.1' (head 39fb78e8732dc4465a2c4908c796df3d745b752c)
to branch 'im.pidgin.pidgin' (head 8b8bc5b1ef1263e1c0f00a9ed208accff09d988e)
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sat, 29 Sep 2007 02:50:14 +0000 |
| parents | 9ad7979b4838 (diff) 4b91ac9fa549 (current diff) |
| children | 3e85d985d9f0 |
| files | libpurple/protocols/msn/msn-utils.c libpurple/protocols/msn/msn-utils.h |
| diffstat | 1 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkpounce.c Fri Sep 28 21:49:48 2007 +0000 +++ b/pidgin/gtkpounce.c Sat Sep 29 02:50:14 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,