Switched to use e_contact_quick_add_free_form. Removed debugging code,

2001-03-08  Jon Trowbridge  <trow@ximian.com>

	* gui/component/select-names/e-select-names-popup.c
	(quick_add_cb): Switched to use e_contact_quick_add_free_form.
	Removed debugging code, hopefully without introducing any bugs
	in the process.

	* gui/component/select-names/e-select-names-text-model.c
	(e_select_names_text_model_insert_length): Fix bug with commas
	inside of name/address combos.  As long as the comma is inside of
	quotes, it will be treated as part of the name rather than as a
	break between addresses.

	* gui/component/select-names/e-select-names-completion.c
	(match_nickname): Use e_card_name_to_string for nickname match
	strings.
	(match_email): Use e_card_name_to_string for email match strings.
	(e_select_names_completion_begin): Strip quotes out of query text,
	so we don't produce malformed sexps.
	Added William Blake quote easter egg.

	* contact-editor/e-contact-quick-add.c: Further attempts to fix...
	mostly unsuccessful.
	(e_contact_quick_add_free_form): Added.  Takes a single string
	and tries to parse out (using some simple, loose rules) the
	name and e-mail -- then calls e_contact_quick_add.  An attempt to
	get the computer to automatically Do The Right Thing.

	* backend/ebook/e-book.c: Fixed some broken indentation.  Yes, I'm
	anal.

	* gui/component/GNOME_Evolution_Addressbook.oafinfo: Added oaf_server
	info for EAddressWidget.

	* gui/component/GNOME_Evolution_Addressbook.oaf.in: Added oaf_server
	info for EAddressWidget.

	* gui/component/addressbook-factory.c (main): Add call to
	e_address_widget_factory_init.

	* gui/component/e-address-widget.h:
	* gui/component/e-address-widget.c: Added.  A little widget (and a
	Bonobo control, BTW) for displaying addresses, with a left-click
	menu.  Used to display addresses in the mail viewer (as embedded
	GtkHTML objects, replacing the text previously used).  Still quite
	incomplete.


2001-03-08  Jon Trowbridge  <trow@ximian.com>

	* mail-format.c (write_field_row_begin): Added.  Table row HTML
	broken out into its own function.
	(write_subject): Added.  Emits the proper HTML for the subject
	line.
	(write_field_to_stream): #ifdef-ed out of existence.
	(write_address): Take a CamelInternetAddress and spit out an
	<object> tag with the appropriate <param>s.

	* mail-display.c (on_object_requested): Check for an "address"
	object.  If found, call...
	(handle_embedded_address_object): ...this function, which creates
	an AddressWidget bonobo control and passes in the necessary info.
	I never really realized just quite how much GtkHTML kicks ass
	until I figured out how to make this work.

svn path=/trunk/; revision=8607

1 files changed, 1 insertions, 31 deletions

diff --git a/addressbook/gui/component/select-names/e-select-names-popup.c b/addressbook/gui/component/select-names/e-select-names-popup.c
index 23898a3079..85c2489b1a 100644
--- a/addressbook/gui/component/select-names/e-select-names-popup.c
+++ b/addressbook/gui/component/select-names/e-select-names-popup.c
@@ -31,8 +31,6 @@
 #include <addressbook/contact-editor/e-contact-quick-add.h>
 #include "e-select-names-popup.h"
 
-static FILE *out = NULL;
-
 typedef struct _PopupInfo PopupInfo;
 struct _PopupInfo {
 	ESelectNamesModel *model;
@@ -64,9 +62,6 @@ popup_info_free (PopupInfo *info)
 {
 	if (info) {
 		
-		if (out)
-			fprintf (out, "popup_info_free\n");
-	
 		if (info->model)
 			gtk_object_unref (GTK_OBJECT (info->model));
 
@@ -103,8 +98,6 @@ change_email_num_cb (GtkWidget *w, gpointer user_data)
 		return;
 
 	n = GPOINTER_TO_INT (gtk_object_get_data (GTK_OBJECT (w), "number"));
-	if (out)
-		fprintf (out, "replacing %d\n", n);
 
 	if (n != e_destination_get_email_num (info->dest)) {
 		dest = e_destination_new ();
@@ -157,9 +150,6 @@ popup_menu_card (PopupInfo *info)
 	EIterator *iterator;
 	gchar *name_str;
 
-	if (out)
-		fprintf (out, "popup_menu_card\n");
-
 	/*
 	 * Build up our GnomeUIInfo array.
 	 */
@@ -236,9 +226,6 @@ popup_menu_card (PopupInfo *info)
 		}
 	}
 
-	if (out)
-		fprintf (out, "leaving popup_menu_card\n");
-
 	return pop;
 }
 
@@ -246,8 +233,7 @@ static void
 quick_add_cb (GtkWidget *w, gpointer user_data)
 {
 	PopupInfo *info = (PopupInfo *) user_data;
-	e_contact_quick_add (NULL, e_destination_get_string (info->dest),
-			     NULL, NULL);
+	e_contact_quick_add_free_form (e_destination_get_string (info->dest), NULL, NULL);
 }
 
 static GtkWidget *
@@ -301,15 +287,6 @@ e_select_names_popup (ESelectNamesModel *model, GdkEventButton *ev, gint pos)
 	g_return_if_fail (ev);
 	g_return_if_fail (0 <= pos);
 
-	if (out == NULL) {
-		out = fopen ("/tmp/evo-debug-select-names-popup", "w");
-		if (out)
-			setvbuf (out, NULL, _IONBF, 0);
-	}
-	
-	if (out)
-		fprintf (out, "\n\ne_select_names_popup\n");
-	
 	e_select_names_model_text_pos (model, pos, &index, NULL, NULL);
 	if (index < 0 || index >= e_select_names_model_count (model))
 		return;
@@ -328,9 +305,6 @@ e_select_names_popup (ESelectNamesModel *model, GdkEventButton *ev, gint pos)
 				    GTK_SIGNAL_FUNC (popup_info_cleanup),
 				    info);
 
-		if (out)
-			fprintf (out, "doing popup\n");
-
 		gnome_popup_menu_do_popup (popup, NULL, NULL, ev, info);
 
 	} else {
@@ -338,8 +312,4 @@ e_select_names_popup (ESelectNamesModel *model, GdkEventButton *ev, gint pos)
 		popup_info_free (info);
 
 	}
-
-	if (out)
-		fprintf (out, "leaving e_select_names_popup\n\n");
-			
 }