# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1131339575 0
# Node ID 06065a4847ff61c0b926a1f1a98429b47da08a08
# Parent  8bcccf2988fa20225f35b1bec410b442591a5a60
[gaim-migrate @ 14295]
When loading our pounces from pounces.xml, if we have a pounce for
an account that does not exist, then we remove the pounce from the
list.  My two changes:
1. Save pounces.xml if this happens
2. Don't print an error when trying to add the pounce to our list
   when data->pounce is NULL (this happens in the scenario described
   above)

committer: Tailor Script <tailor@pidgin.im>

diff -r 8bcccf2988fa -r 06065a4847ff src/pounce.c
--- a/src/pounce.c	Mon Nov 07 04:49:23 2005 +0000
+++ b/src/pounce.c	Mon Nov 07 04:59:35 2005 +0000
@@ -430,6 +430,11 @@
 		if (account == NULL) {
 			gaim_debug(GAIM_DEBUG_ERROR, "pounce",
 					   "Account for pounce not found!\n");
+			/*
+			 * This pounce has effectively been removed, so make
+			 * sure that we save the changes to pounces.xml
+			 */
+			schedule_pounces_save();
 		}
 		else {
 			gaim_debug(GAIM_DEBUG_INFO, "pounce",
@@ -444,7 +449,8 @@
 		data->pouncee = NULL;
 	}
 	else if (!strcmp(element_name, "save")) {
-		gaim_pounce_set_save(data->pounce, TRUE);
+		if (data->pounce != NULL)
+			gaim_pounce_set_save(data->pounce, TRUE);
 	}
 	else if (!strcmp(element_name, "pounce")) {
 		data->pounce = NULL;