From afe6fc18fc95f00efdbd3ea7f5ebd6c7fd64330d Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Thu, 8 Mar 2001 23:15:20 +0000 Subject: Switched to use e_contact_quick_add_free_form. Removed debugging code, 2001-03-08 Jon Trowbridge * 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 * 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 tag with the appropriate 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 --- .../component/GNOME_Evolution_Addressbook.oaf.in | 28 ++ .../component/GNOME_Evolution_Addressbook.oafinfo | 27 ++ addressbook/gui/component/Makefile.am | 4 +- addressbook/gui/component/addressbook-factory.c | 3 + addressbook/gui/component/e-address-widget.c | 414 +++++++++++++++++++++ addressbook/gui/component/e-address-widget.h | 81 ++++ .../select-names/e-select-names-completion.c | 30 +- .../component/select-names/e-select-names-popup.c | 32 +- .../select-names/e-select-names-text-model.c | 23 +- 9 files changed, 604 insertions(+), 38 deletions(-) create mode 100644 addressbook/gui/component/e-address-widget.c create mode 100644 addressbook/gui/component/e-address-widget.h (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in index 2a523c9dc1..2e604862af 100644 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in +++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in @@ -87,6 +87,34 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo index 01474ce90a..03c2e66d19 100644 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo +++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo @@ -89,4 +89,31 @@ value="evolution-contacts.png"/> + + + + + + + + + + + + + + + + + + + + + diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index eaefdbab96..59b1d4c394 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -36,7 +36,9 @@ evolution_addressbook_SOURCES = \ addressbook.c \ addressbook.h \ e-cardlist-model.c \ - e-cardlist-model.h + e-cardlist-model.h \ + e-address-widget.h \ + e-address-widget.c evolution_addressbook_LDADD = \ select-names/libeselectnames.la \ diff --git a/addressbook/gui/component/addressbook-factory.c b/addressbook/gui/component/addressbook-factory.c index ebfd0d9cfd..3887090a91 100644 --- a/addressbook/gui/component/addressbook-factory.c +++ b/addressbook/gui/component/addressbook-factory.c @@ -18,6 +18,7 @@ #include "addressbook.h" #include "addressbook-component.h" +#include "e-address-widget.h" #include "addressbook/gui/widgets/e-minicard-control.h" #include "select-names/e-select-names-factory.h" @@ -63,6 +64,8 @@ main (int argc, char **argv) e_minicard_control_factory_init (); + e_address_widget_factory_init (); + e_cursors_init(); unicode_init(); diff --git a/addressbook/gui/component/e-address-widget.c b/addressbook/gui/component/e-address-widget.c new file mode 100644 index 0000000000..2af83e67aa --- /dev/null +++ b/addressbook/gui/component/e-address-widget.c @@ -0,0 +1,414 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * e-address-widget.c + * + * Copyright (C) 2001 Ximian, Inc. + * + * Developed by Jon Trowbridge + */ + +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + */ + +#include +#include +#include +#include +#include +#include "e-address-widget.h" + +static void e_address_widget_class_init (EAddressWidgetClass *klass); +static void e_address_widget_init (EAddressWidget *obj); +static void e_address_widget_destroy (GtkObject *obj); + +static gint e_address_widget_button_press_handler (GtkWidget *w, GdkEventButton *ev); +static void e_address_widget_popup (EAddressWidget *, GdkEventButton *ev); + +static GtkObjectClass *parent_class; + +static void +e_address_widget_class_init (EAddressWidgetClass *klass) +{ + GtkObjectClass *object_class = (GtkObjectClass *) klass; + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + parent_class = GTK_OBJECT_CLASS (gtk_type_class (gtk_event_box_get_type ())); + + object_class->destroy = e_address_widget_destroy; + + widget_class->button_press_event = e_address_widget_button_press_handler; +} + +static void +e_address_widget_init (EAddressWidget *addr) +{ + +} + +static void +e_address_widget_destroy (GtkObject *obj) +{ + EAddressWidget *addr = E_ADDRESS_WIDGET (obj); + + g_free (addr->name); + g_free (addr->email); + if (addr->card) + gtk_object_unref (GTK_OBJECT (addr->card)); +} + +static gint +e_address_widget_button_press_handler (GtkWidget *w, GdkEventButton *ev) +{ + EAddressWidget *addr = E_ADDRESS_WIDGET (w); + if (ev->button == 3 && ev->state == 0) { + e_address_widget_popup (addr, ev); + return TRUE; + } + + return FALSE; +} + +GtkType +e_address_widget_get_type (void) +{ + static GtkType aw_type = 0; + + if (!aw_type) { + GtkTypeInfo aw_info = { + "EAddressWidget", + sizeof (EAddressWidget), + sizeof (EAddressWidgetClass), + (GtkClassInitFunc) e_address_widget_class_init, + (GtkObjectInitFunc) e_address_widget_init, + NULL, NULL, /* reserved... but for what sinister purpose? */ + (GtkClassInitFunc) NULL + }; + + aw_type = gtk_type_unique (gtk_event_box_get_type (), &aw_info); + } + + return aw_type; +} + +static void +gtk_widget_visible (GtkWidget *w, gboolean x) +{ + if (x) + gtk_widget_show (w); + else + gtk_widget_hide (w); +} + +static void +e_address_widget_refresh (EAddressWidget *addr) +{ + gchar *str; + gboolean have_name, have_email; + + g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr)); + + have_name = addr->name && *addr->name; + have_email = addr->email && *addr->email; + + gtk_label_set_text (GTK_LABEL (addr->name_widget), have_name ? addr->name : ""); + gtk_widget_visible (addr->name_widget, have_name); + + if (have_email) { + str = g_strdup_printf (have_name ? "<%s>" : "%s", addr->email); + gtk_label_set_text (GTK_LABEL (addr->email_widget), str); + g_free (str); + } else { + gtk_label_set_text (GTK_LABEL (addr->email_widget), ""); + } + gtk_widget_visible (addr->email_widget, have_email); + + gtk_widget_visible (addr->spacer, have_name && have_email); + + /* Launch a query to find the appropriate card, if necessary. */ + addr->querying = TRUE; +} + +void +e_address_widget_set_name (EAddressWidget *addr, const gchar *name) +{ + g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr)); + + g_free (addr->name); + addr->name = g_strdup (name); + + e_address_widget_refresh (addr); +} + +void +e_address_widget_set_email (EAddressWidget *addr, const gchar *email) +{ + g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr)); + + g_free (addr->email); + addr->email = g_strdup (email); + + e_address_widget_refresh (addr); +} + + +void +e_address_widget_set_text (EAddressWidget *addr, const gchar *text) +{ + g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr)); + + e_address_widget_set_email (addr, text); /* CRAP */ +} + +void +e_address_widget_construct (EAddressWidget *addr) +{ + GtkWidget *box; + + g_return_if_fail (addr && E_IS_ADDRESS_WIDGET (addr)); + + box = gtk_hbox_new (FALSE, 2); + + addr->name_widget = gtk_label_new (""); + addr->spacer = gtk_label_new (" "); + addr->email_widget = gtk_label_new (""); + + gtk_box_pack_start (GTK_BOX (box), addr->name_widget, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), addr->spacer, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), addr->email_widget, FALSE, FALSE, 0); + + + gtk_container_add (GTK_CONTAINER (addr), box); + + gtk_widget_show (box); + gtk_widget_show (addr->name_widget); + gtk_widget_show (addr->email_widget); +} + +GtkWidget * +e_address_widget_new (void) +{ + EAddressWidget *addr = gtk_type_new (e_address_widget_get_type ()); + e_address_widget_construct (addr); + return GTK_WIDGET (addr); +} + +/* + * + * Popup Menu + * + */ + +#define ARBITRARY_UIINFO_LIMIT 64 +static GtkWidget * +popup_menu_card (EAddressWidget *addr) +{ + ECard *card = E_CARD (addr->card); + g_return_val_if_fail (card != NULL, NULL); + + return NULL; +} + +static void +add_contacts_cb (GtkWidget *w, gpointer user_data) +{ + EAddressWidget *addr = E_ADDRESS_WIDGET (user_data); + + e_contact_quick_add (addr->name, addr->email, NULL, NULL); +} + +static GtkWidget * +popup_menu_nocard (EAddressWidget *addr) +{ + GnomeUIInfo uiinfo[ARBITRARY_UIINFO_LIMIT]; + GtkWidget *pop; + gint i=0, dead; + + memset (uiinfo, 0, sizeof (uiinfo)); + + if (addr->name) { + uiinfo[i].type = GNOME_APP_UI_ITEM; + uiinfo[i].label = addr->name; + ++i; + } + + if (addr->email) { + uiinfo[i].type = GNOME_APP_UI_ITEM; + uiinfo[i].label = addr->email; + ++i; + } + dead = i; + + uiinfo[i].type = GNOME_APP_UI_SEPARATOR; + ++i; + + uiinfo[i].type = GNOME_APP_UI_ITEM; + uiinfo[i].label = N_("Add to Contacts"); + uiinfo[i].moreinfo = add_contacts_cb; + ++i; + + uiinfo[i].type = GNOME_APP_UI_ENDOFINFO; + + + pop = gnome_popup_menu_new (uiinfo); + for (i=0; icard ? popup_menu_card (addr) : popup_menu_nocard (addr); + + if (pop) + gnome_popup_menu_do_popup (pop, NULL, NULL, ev, addr); +} + +/* + * + * Bonobo Control Magic + * + */ + +enum { + ADDRESS_PROPERTY_NAME, + ADDRESS_PROPERTY_EMAIL, + ADDRESS_PROPERTY_TEXT, + ADDRESS_PROPERTY_BACKGROUND_RGB +}; + + +static void +get_prop (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data) +{ + EAddressWidget *addr = E_ADDRESS_WIDGET (user_data); + + switch (arg_id) { + + case ADDRESS_PROPERTY_NAME: + BONOBO_ARG_SET_STRING (arg, addr->name ? addr->name :""); + break; + + case ADDRESS_PROPERTY_EMAIL: + BONOBO_ARG_SET_STRING (arg, addr->email ? addr->email : ""); + break; + + case ADDRESS_PROPERTY_TEXT: + BONOBO_ARG_SET_STRING (arg, "?"); + break; + } +} + +static void +set_prop (BonoboPropertyBag *bag, const BonoboArg *arg, guint arg_id, CORBA_Environment *ev, gpointer user_data) +{ + EAddressWidget *addr = E_ADDRESS_WIDGET (user_data); + + switch (arg_id) { + case ADDRESS_PROPERTY_NAME: + e_address_widget_set_name (addr, BONOBO_ARG_GET_STRING (arg)); + break; + + case ADDRESS_PROPERTY_EMAIL: + e_address_widget_set_email (addr, BONOBO_ARG_GET_STRING (arg)); + break; + + case ADDRESS_PROPERTY_TEXT: + e_address_widget_set_text (addr, BONOBO_ARG_GET_STRING (arg)); + break; + + + case ADDRESS_PROPERTY_BACKGROUND_RGB: + { + gint bg = BONOBO_ARG_GET_INT (arg); + GdkColor color; + + color.red = (bg & 0xff0000) >> 8; + color.green = (bg & 0x00ff00); + color.blue = (bg & 0x0000ff) << 8; + + if (gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (addr)), &color, FALSE, TRUE)) { + GtkStyle *style = gtk_style_copy (gtk_widget_get_style (GTK_WIDGET (addr))); + style->bg[0] = color; + gtk_widget_set_style (GTK_WIDGET (addr), style); + } + } + + break; + } +} + +static BonoboControl * +e_address_widget_factory_new_control (void) +{ + BonoboControl *control; + BonoboPropertyBag *bag; + GtkWidget *w; + + w = e_address_widget_new (); + gtk_widget_show (w); + + control = bonobo_control_new (w); + + bag = bonobo_property_bag_new (get_prop, set_prop, w); + bonobo_property_bag_add (bag, "name", ADDRESS_PROPERTY_NAME, + BONOBO_ARG_STRING, NULL, NULL, + BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE); + + bonobo_property_bag_add (bag, "email", ADDRESS_PROPERTY_EMAIL, + BONOBO_ARG_STRING, NULL, NULL, + BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE); + + bonobo_property_bag_add (bag, "text", ADDRESS_PROPERTY_TEXT, + BONOBO_ARG_STRING, NULL, NULL, + BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE); + + bonobo_property_bag_add (bag, "background_rgb", ADDRESS_PROPERTY_BACKGROUND_RGB, + BONOBO_ARG_INT, NULL, NULL, + BONOBO_PROPERTY_WRITEABLE); + + bonobo_control_set_properties (control, bag); + bonobo_object_unref (BONOBO_OBJECT (bag)); + + return control; +} + +static BonoboObject * +e_address_widget_factory (BonoboGenericFactory *factory, gpointer user_data) +{ + return BONOBO_OBJECT (e_address_widget_factory_new_control ()); +} + +void +e_address_widget_factory_init (void) +{ + static BonoboGenericFactory *factory = NULL; + + if (factory != NULL) + return; + + factory = bonobo_generic_factory_new ("OAFIID:GNOME_Evolution_Addressbook_AddressWidgetFactory", + e_address_widget_factory, NULL); + + if (factory == NULL) + g_error ("I could not register an AddressWidget factory."); +} diff --git a/addressbook/gui/component/e-address-widget.h b/addressbook/gui/component/e-address-widget.h new file mode 100644 index 0000000000..7168242323 --- /dev/null +++ b/addressbook/gui/component/e-address-widget.h @@ -0,0 +1,81 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ + +/* + * e-address-widget.h + * + * Copyright (C) 2001 Ximian, Inc. + * + * Developed by Jon Trowbridge + */ + +/* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + * USA. + */ + +#ifndef __E_ADDRESS_WIDGET_H__ +#define __E_ADDRESS_WIDGET_H__ + +#include +#include +#include + +BEGIN_GNOME_DECLS + +#define E_ADDRESS_WIDGET_TYPE (e_address_widget_get_type ()) +#define E_ADDRESS_WIDGET(o) (GTK_CHECK_CAST ((o), E_ADDRESS_WIDGET_TYPE, EAddressWidget)) +#define E_ADDRESS_WIDGET_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), E_ADDRESS_WIDGET_TYPE, EAddressWidgetClass)) +#define E_IS_ADDRESS_WIDGET(o) (GTK_CHECK_TYPE ((o), E_ADDRESS_WIDGET_TYPE)) +#define E_IS_ADDRESS_WIDGET_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_ADDRESS_WIDGET_TYPE)) + +typedef struct _EAddressWidget EAddressWidget; +typedef struct _EAddressWidgetClass EAddressWidgetClass; + +struct _EAddressWidget { + GtkEventBox parent; + + gchar *name; + gchar *email; + + GtkWidget *name_widget; + GtkWidget *email_widget; + GtkWidget *spacer; + + gboolean querying; + ECard *card; +}; + +struct _EAddressWidgetClass { + GtkHBoxClass parent_class; +}; + +GtkType e_address_widget_get_type (void); + +void e_address_widget_set_name (EAddressWidget *, const gchar *name); +void e_address_widget_set_email (EAddressWidget *, const gchar *email); +void e_address_widget_set_text (EAddressWidget *, const gchar *text); + +void e_address_widget_construct (EAddressWidget *); +GtkWidget *e_address_widget_new (void); + + +void e_address_widget_factory_init (void); + + + +END_GNOME_DECLS + +#endif /* __E_ADDRESS_WIDGET_H__ */ + diff --git a/addressbook/gui/component/select-names/e-select-names-completion.c b/addressbook/gui/component/select-names/e-select-names-completion.c index 5f87144510..aa1bf7e2e3 100644 --- a/addressbook/gui/component/select-names/e-select-names-completion.c +++ b/addressbook/gui/component/select-names/e-select-names-completion.c @@ -97,11 +97,14 @@ match_nickname (ESelectNamesCompletion *comp, EDestination *dest, double *score) if (card->nickname && !g_strncasecmp (comp->priv->query_text, card->nickname, len)) { + gchar *name = e_card_name_to_string (card->name); + gchar *str; *score = len * 10; /* nickname gives 10 points per matching character */ - return g_strdup_printf ("(%s) %s %s", card->nickname, card->name->given, card->name->family); - + str = g_strdup_printf ("(%s) %s", card->nickname, name); + g_free (name); + return str; } return NULL; @@ -125,8 +128,12 @@ match_email (ESelectNamesCompletion *comp, EDestination *dest, double *score) const gchar *email = e_destination_get_email (dest); if (email && !g_strncasecmp (comp->priv->query_text, email, len)) { + gchar *name, *str; *score = len * 2; /* 2 points for each matching character */ - return g_strdup_printf ("<%s> %s %s", email, card->name->given, card->name->family); + name = e_card_name_to_string (card->name); + str = g_strdup_printf ("<%s> %s", email, name); + g_free (name); + return str; } return NULL; @@ -693,7 +700,9 @@ struct _SearchOverride { const gchar *text[4]; }; static SearchOverride override[] = { - { "easter egg", { "This is the sample", "Easter Egg text for", "Evolution.", NULL } }, + { "why?", { "\"I must create a system, or be enslaved by another man's.\"", + " -- Wiliam Blake, \"Jerusalem\"", + NULL } }, { NULL, { NULL } } }; static gboolean @@ -711,6 +720,7 @@ e_select_names_completion_begin (ECompletion *comp, const gchar *text, gint pos, ESelectNamesCompletion *selcomp = E_SELECT_NAMES_COMPLETION (comp); const gchar *str; gint index, j; + gchar *s, *t; g_return_if_fail (comp != NULL); g_return_if_fail (E_IS_SELECT_NAMES_COMPLETION (comp)); @@ -751,6 +761,18 @@ e_select_names_completion_begin (ECompletion *comp, const gchar *text, gint pos, g_free (selcomp->priv->pending_query_text); selcomp->priv->pending_query_text = g_strdup (str); + + /* Strip problematic characters out of query text. */ + s = t = selcomp->priv->pending_query_text; + while (*s) { + if (*s != ',' && *s != '"') { + if (s != t) + *t = *s; + ++t; + } + ++s; + } + *t = '\0'; e_select_names_completion_do_query (selcomp); } 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 #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"); - } diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c index d66112d2bc..0e4d5eeb32 100644 --- a/addressbook/gui/component/select-names/e-select-names-text-model.c +++ b/addressbook/gui/component/select-names/e-select-names-text-model.c @@ -125,7 +125,7 @@ dump_model (ESelectNamesTextModel *text_model) if (out == NULL) return; - + fprintf (out, "\n*** Model State: count=%d\n", e_select_names_model_count (model)); for (i=0; i= 0) { /* Is this a quoted or an unquoted comma we are dealing with? */ + const EDestination *dest = e_select_names_model_get_destination (source, index); + if (dest) { + const gchar *str = e_destination_get_string (dest); + gint j; + if (out) + fprintf (out, "str=%s pos=%d\n", str, pos); + for (j=0; j