Added addressbook/gui/search/Makefile.

2000-08-12  Christopher James Lahey  <clahey@helixcode.com>

	* configure.in: Added addressbook/gui/search/Makefile.

From addressbook/ChangeLog

2000-08-12  Christopher James Lahey  <clahey@helixcode.com>

	* gui/Makefile.am: Added the search directory.

	* backend/ebook/e-book.c: Fixed a potential crash.

	* gui/minicard/e-reflow-sorted.h: Fixed an include line.

	* gui/search/.cvsignore, gui/search/Makefile.am: New files.

	* gui/search/e-addressbook-search-dialog.c: Fixed compilation.

svn path=/trunk/; revision=4779

10 files changed, 62 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index b6c8ea98f9..2c3e378f4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
+
+	* configure.in: Added addressbook/gui/search/Makefile.
+
 2000-08-12  Dan Winship  <danw@helixcode.com>
 
 	* configure.in, README: Depend on gnome-vfs 0.3
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6b2102ddd1..0ca71a0b12 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,17 @@
 2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
 
+	* gui/Makefile.am: Added the search directory.
+
+	* backend/ebook/e-book.c: Fixed a potential crash.
+
+	* gui/minicard/e-reflow-sorted.h: Fixed an include line.
+
+	* gui/search/.cvsignore, gui/search/Makefile.am: New files.
+
+	* gui/search/e-addressbook-search-dialog.c: Fixed compilation.
+
+2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
+
 	* printing/Makefile.am: Ettore fixed compilation.
 
 2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c
index ce1c663073..38179559ba 100644
--- a/addressbook/backend/ebook/e-book.c
+++ b/addressbook/backend/ebook/e-book.c
@@ -406,7 +406,7 @@ e_book_unload_uri (EBook *book)
 	 * FIXME: Make sure this works if the URI is still being
 	 * loaded.
 	 */
-	if (book->priv->load_state == URINotLoaded) {
+	if (book->priv->load_state != URILoaded) {
 		g_warning ("e_book_unload_uri: No URI is loaded!\n");
 		return;
 	}
@@ -943,7 +943,7 @@ e_book_destroy (GtkObject *object)
 	EBook             *book = E_BOOK (object);
 	CORBA_Environment  ev;
 
-	if (book->priv->load_state != URINotLoaded)
+	if (book->priv->load_state == URILoaded)
 		e_book_unload_uri (book);
 
 	CORBA_exception_init (&ev);
diff --git a/addressbook/gui/Makefile.am b/addressbook/gui/Makefile.am
index 50c258b544..a9fdef3273 100644
--- a/addressbook/gui/Makefile.am
+++ b/addressbook/gui/Makefile.am
@@ -1 +1 @@
-SUBDIRS = minicard component
\ No newline at end of file
+SUBDIRS = minicard search component
\ No newline at end of file
diff --git a/addressbook/gui/minicard/e-reflow-sorted.h b/addressbook/gui/minicard/e-reflow-sorted.h
index 7adfa2c045..1be4971fb2 100644
--- a/addressbook/gui/minicard/e-reflow-sorted.h
+++ b/addressbook/gui/minicard/e-reflow-sorted.h
@@ -21,7 +21,7 @@
 #ifndef __E_REFLOW_SORTED_H__
 #define __E_REFLOW_SORTED_H__
 
-#include <e-reflow.h>
+#include <addressbook/gui/minicard/e-reflow.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/addressbook/gui/search/.cvsignore b/addressbook/gui/search/.cvsignore
new file mode 100644
index 0000000000..d6c55c7345
--- /dev/null
+++ b/addressbook/gui/search/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+.pure
+Makefile
+Makefile.in
+*.lo
+*.la
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
new file mode 100644
index 0000000000..d18e9dcdfe
--- /dev/null
+++ b/addressbook/gui/search/Makefile.am
@@ -0,0 +1,16 @@
+INCLUDES =						\
+	-DG_LOG_DOMAIN=\"e-addressbook-search\"		\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/addressbook/backend		\
+	-I$(top_builddir)/addressbook/backend		\
+	-I$(top_srcdir)/addressbook/contact-editor	\
+	-I$(top_srcdir)/widgets/e-text			\
+	-I$(top_srcdir)/widgets/misc			\
+	$(BONOBO_GNOME_CFLAGS)
+
+noinst_LIBRARIES =				\
+	libeaddressbooksearchdialog.a
+
+libeaddressbooksearchdialog_a_SOURCES =		\
+	e-addressbook-search-dialog.c		\
+	e-addressbook-search-dialog.h
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c
index c25187f0b4..e89eafa074 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ b/addressbook/gui/search/e-addressbook-search-dialog.c
@@ -24,7 +24,7 @@
 #include <gnome.h>
 #include <e-util/e-canvas.h>
 #include "e-addressbook-search-dialog.h"
-#include "e-minicard-view-widget.h"
+#include "addressbook/gui/minicard/e-minicard-view-widget.h"
 static void e_addressbook_search_dialog_init		 (EAddressbookSearchDialog		 *widget);
 static void e_addressbook_search_dialog_class_init	 (EAddressbookSearchDialogClass	 *klass);
 static void e_addressbook_search_dialog_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);
@@ -85,15 +85,22 @@ e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass)
 	object_class->set_arg       = e_addressbook_search_dialog_set_arg;
 	object_class->get_arg       = e_addressbook_search_dialog_get_arg;
 	object_class->destroy       = e_addressbook_search_dialog_destroy;
+}
 
-	widget_class->realize       = e_addressbook_search_dialog_realize;
-	widget_class->size_allocate = e_addressbook_search_dialog_size_allocate;
+static GtkWidget *
+get_widget ()
+{
+	return gtk_entry_new();
+}
 
-	canvas_class->reflow        = e_addressbook_search_dialog_reflow;
+static char *
+get_query ()
+{
+	return "(contains \"email\" \"\")";
 }
 
 static void
-button_press (GtkWidget *widget, EAddressBookSearchDialog *dialog)
+button_press (GtkWidget *widget, EAddressbookSearchDialog *dialog)
 {
 	char *query;
 	gtk_widget_show(dialog->view);
@@ -107,7 +114,7 @@ button_press (GtkWidget *widget, EAddressBookSearchDialog *dialog)
 static void
 e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
 {
-	GtkWidget *search_button;
+	GtkWidget *button;
 	GnomeDialog *dialog = GNOME_DIALOG (view);
 
 	view->search = get_widget();
@@ -116,6 +123,8 @@ e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
 
 	button = gtk_button_new_with_label(_("Search"));
 	gtk_box_pack_start(GTK_BOX(dialog->vbox), button, FALSE, FALSE, 0);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked",
+			   GTK_SIGNAL_FUNC(button_press), view);
 	gtk_widget_show(button);
 
 	view->view = e_minicard_view_widget_new();
@@ -141,7 +150,7 @@ e_addressbook_search_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 
 	switch (arg_id){
 	case ARG_BOOK:
-		gtk_object_set(GTK_OBJECT(view->view),
+		gtk_object_set(GTK_OBJECT(emvw->view),
 			       "book", GTK_VALUE_OBJECT (*arg),
 			       NULL);
 		break;
@@ -157,7 +166,7 @@ e_addressbook_search_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_i
 
 	switch (arg_id) {
 	case ARG_BOOK:
-		gtk_object_get(GTK_OBJECT(view->view),
+		gtk_object_get(GTK_OBJECT(emvw->view),
 			       "book", &(GTK_VALUE_OBJECT (*arg)),
 			       NULL);
 		break;
@@ -170,7 +179,5 @@ e_addressbook_search_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_i
 static void
 e_addressbook_search_dialog_destroy (GtkObject *object)
 {
-	EAddressbookSearchDialog *view = E_ADDRESSBOOK_SEARCH_DIALOG(object);
-
 	GTK_OBJECT_CLASS(parent_class)->destroy (object);
 }
diff --git a/configure.in b/configure.in
index ac6dcf8a07..1e615b90e2 100644
--- a/configure.in
+++ b/configure.in
@@ -555,6 +555,7 @@ addressbook/backend/pas/Makefile
 addressbook/backend/ebook/Makefile
 addressbook/gui/Makefile
 addressbook/gui/minicard/Makefile
+addressbook/gui/search/Makefile
 addressbook/gui/component/Makefile
 addressbook/gui/component/select-names/Makefile
 shell/Makefile
diff --git a/widgets/e-reflow/e-reflow-sorted.h b/widgets/e-reflow/e-reflow-sorted.h
index 7adfa2c045..1be4971fb2 100644
--- a/widgets/e-reflow/e-reflow-sorted.h
+++ b/widgets/e-reflow/e-reflow-sorted.h
@@ -21,7 +21,7 @@
 #ifndef __E_REFLOW_SORTED_H__
 #define __E_REFLOW_SORTED_H__
 
-#include <e-reflow.h>
+#include <addressbook/gui/minicard/e-reflow.h>
 
 #ifdef __cplusplus
 extern "C" {