remove the gtk_widget_show call... (e_contact_editor_show): and put it

2001-06-08  Chris Toshok  <toshok@ximian.com>

	* contact-editor/e-contact-editor.c (e_contact_editor_new): remove
	the gtk_widget_show call...
	(e_contact_editor_show): and put it here.

	* contact-editor/e-contact-editor.h: add prototype for
	e_contact_editor_show.

	* gui/widgets/e-minicard.c (e_minicard_event): call
	e_addressbook_show_contact_editor.
	(card_modified_cb): call e_addressbook_error_dialog if status !=
	SUCCESS.

	* gui/widgets/e-minicard-view.c (e_minicard_view_event): call
	e_addressbook_show_contact_editor.  also, use card_modified_cb as
	the commit_card callback.

	* gui/widgets/e-addressbook-view.c (table_double_click): clean
	this area up alot, call e_addressbook_show_contact_editor.
	(card_deleted_cb): call e_addressbook_error_dialog.

	* gui/widgets/e-addressbook-table-adapter.c
	(card_modified_cb): new function, call e_addressbook_error_dialog
	if the status != SUCCESS.
	(addressbook_set_value_at): use card_modified_cb as the callback
	for e_book_commit_card.

	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): add
	e-addressbook-util.[ch].

	* gui/component/addressbook.c (new_contact_cb): use
	e_addressbook_show_contact_editor here.

svn path=/trunk/; revision=10164

1 files changed, 2 insertions, 74 deletions

diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index e75f83b663..1ae42755ca 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -31,6 +31,7 @@
 #include "addressbook.h"
 #include "addressbook/gui/search/e-addressbook-search-dialog.h"
 #include "addressbook/gui/widgets/e-addressbook-view.h"
+#include "addressbook/gui/widgets/e-addressbook-util.h"
 #include "addressbook/printing/e-contact-print.h"
 
 #include <ebook/e-book.h>
@@ -52,79 +53,6 @@ typedef struct {
 } AddressbookView;
 
 static void
-card_added_cb (EBook* book, EBookStatus status, const char *id,
-	    gpointer user_data)
-{
-	g_print ("%s: %s(): a card was added\n", __FILE__, __FUNCTION__);
-}
-
-static void
-card_modified_cb (EBook* book, EBookStatus status,
-		  gpointer user_data)
-{
-	g_print ("%s: %s(): a card was modified\n", __FILE__, __FUNCTION__);
-}
-
-/* Callback for the add_card signal from the contact editor */
-static void
-add_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_add_card (book, card, card_added_cb, NULL);
-}
-
-/* Callback for the commit_card signal from the contact editor */
-static void
-commit_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_commit_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback for the delete_card signal from the contact editor */
-static void
-delete_card_cb (EContactEditor *ce, ECard *card, gpointer data)
-{
-	EBook *book;
-
-	book = E_BOOK (data);
-	e_book_remove_card (book, card, card_modified_cb, NULL);
-}
-
-/* Callback used when the contact editor is closed */
-static void
-editor_closed_cb (EContactEditor *ce, gpointer data)
-{
-	gtk_object_unref (GTK_OBJECT (ce));
-}
-
-static void
-supported_fields_cb (EBook *book, EBookStatus status, EList *fields, gpointer closure)
-{
-	EContactEditor *ce;
-	ECard *card;
-
-	card = e_card_new("");
-
-	ce = e_contact_editor_new (card, TRUE, fields, FALSE);
-
-	gtk_signal_connect (GTK_OBJECT (ce), "add_card",
-			    GTK_SIGNAL_FUNC (add_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "commit_card",
-			    GTK_SIGNAL_FUNC (commit_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "delete_card",
-			    GTK_SIGNAL_FUNC (delete_card_cb), book);
-	gtk_signal_connect (GTK_OBJECT (ce), "editor_closed",
-			    GTK_SIGNAL_FUNC (editor_closed_cb), NULL);
-
-	gtk_object_sink(GTK_OBJECT(card));
-}
-
-static void
 new_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 {
 	EBook *book;
@@ -136,7 +64,7 @@ new_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)
 
 	g_assert (E_IS_BOOK (book));
 
-	e_book_get_supported_fields (book, supported_fields_cb, view);
+	e_addressbook_show_contact_editor (book, NULL, e_addressbook_view_can_create (view->view));
 }
 
 static void