Add a huge steaming pile of code to handle the case of single-address

2001-06-25  Jon Trowbridge  <trow@ximian.com>

        * gui/component/e-address-popup.c: Add a huge steaming pile of
        code to handle the case of single-address merging.  In other
        words, if you go to "harvest" an address by right-clicking on it
        in the mail viewer, and you already have a closely-matching
        contact (w/ a different e-mail address), this gives you the
        option of editting that contact's e-mail addresses to add the
        one you just clicked on.

        * backend/ebook/e-card-compare.c (match_search_info_free): It is
        amazing how much better things work when you don't try to
        dereference the pointer you just freed.

svn path=/trunk/; revision=10469

1 files changed, 2 insertions, 3 deletions

diff --git a/addressbook/gui/component/e-address-popup.h b/addressbook/gui/component/e-address-popup.h
index 26b1c49219..9cfde6cb28 100644
--- a/addressbook/gui/component/e-address-popup.h
+++ b/addressbook/gui/component/e-address-popup.h
@@ -46,9 +46,6 @@ typedef struct _EAddressPopupClass EAddressPopupClass;
 struct _EAddressPopup {
 	GtkEventBox parent;
 
-	guint leave_timeout_tag;
-	gboolean grabbed;
-
 	gchar *name;
 	gchar *email;
 
@@ -60,6 +57,8 @@ struct _EAddressPopup {
 	GtkWidget *generic_view;
 	GtkWidget *minicard_view;
 
+	gboolean transitory;
+
 	guint scheduled_refresh;
 	guint query_tag;
 	gboolean multiple_matches;