# HG changeset patch
# User William Ehlhardt <williamehlhardt@gmail.com>
# Date 1191041990 0
# Node ID 3e85d985d9f0bd9e6de822a8aeb0a2c9460f51ad
# Parent  d6fb31898506e527436447d1e8718a0f4e7dee21# Parent  8a830c4ce996a859f52f858ad06e2cff1d8beb1a
merge of '27d49044df2da785a519726b37211c6c5218bc41'
     and '6a82d40bc7eedd0f5990f952ce1cfc7d194eabdb'

diff -r d6fb31898506 -r 3e85d985d9f0 pidgin/gtkpounce.c
--- 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,