[evolution-patches] Addressbook: patch for #273716

[Sushma Rai <rsushma novell com>]

Please review.

Thanks,
Sushma.

Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1962
diff -u -p -r1.1962 ChangeLog
--- addressbook/ChangeLog	25 Jul 2005 07:06:16 -0000	1.1962
+++ addressbook/ChangeLog	28 Jul 2005 12:56:31 -0000
@@ -1,3 +1,10 @@
+2005-07-28  Sushma Rai  <rsushma novell com>
+
+	* gui/widgets/eab-gui-util.c (contact_added_cb): cleanup only on 
+	success and not on cancel operation. Fixes #311133.
+	(got_book_cb): Clenaup only on loading the address book is success.
+	Fixes #273716.
+
 2005-07-25  Arunprakash <arunp novell com>
 
 	* gui/contact-editor/e-contact-editor.c (file_as_entry_changed)
Index: addressbook/gui/widgets/eab-gui-util.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/eab-gui-util.c,v
retrieving revision 1.41
diff -u -p -r1.41 eab-gui-util.c
--- addressbook/gui/widgets/eab-gui-util.c	19 Jul 2005 07:52:01 -0000	1.41
+++ addressbook/gui/widgets/eab-gui-util.c	28 Jul 2005 12:58:00 -0000
@@ -678,7 +678,9 @@ contact_added_cb (EBook* book, EBookStat
 
 	if (status != E_BOOK_ERROR_OK && status != E_BOOK_ERROR_CANCELLED) {
 		eab_error_dialog (_("Error adding contact"), status);
-	} else {
+	} 
+	else if (status == E_BOOK_ERROR_OK) {
+		/* only on success and not on cancel */
 		process_unref (process);
 	}
 }
@@ -710,8 +712,8 @@ got_book_cb (EBook *book, EBookStatus st
 		g_list_foreach (process->contacts,
 				do_copy,
 				process);
+		process_unref (process);
 	}
-	process_unref (process);
 }
 
 void