A few small interface fixes.

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

	* gui/search/Makefile.am,
	gui/search/e-addressbook-search-dialog.c,
	gui/search/e-addressbook-search-dialog.h: A few small interface
	fixes.

	* gui/component/Makefile.am: Link in the addressbook search
	dialog.

svn path=/trunk/; revision=4780

5 files changed, 26 insertions, 5 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 0ca71a0b12..2bb891f15c 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,15 @@
 2000-08-12  Christopher James Lahey  <clahey@helixcode.com>
 
+	* gui/search/Makefile.am,
+	gui/search/e-addressbook-search-dialog.c,
+	gui/search/e-addressbook-search-dialog.h: A few small interface
+	fixes.
+
+	* gui/component/Makefile.am: Link in the addressbook search
+	dialog.
+
+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.
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index fd569fa9bb..9dc6f10e3a 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -57,7 +57,8 @@ evolution_addressbook_LDADD =						\
 	$(top_builddir)/widgets/e-table/libetable.a			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/addressbook/printing/libecontactprint.a
+	$(top_builddir)/addressbook/printing/libecontactprint.a		\
+	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a
 
 evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf`
 
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
index d18e9dcdfe..1050da1843 100644
--- a/addressbook/gui/search/Makefile.am
+++ b/addressbook/gui/search/Makefile.am
@@ -9,8 +9,8 @@ INCLUDES =						\
 	$(BONOBO_GNOME_CFLAGS)
 
 noinst_LIBRARIES =				\
-	libeaddressbooksearchdialog.a
+	libeaddressbooksearch.a
 
-libeaddressbooksearchdialog_a_SOURCES =		\
+libeaddressbooksearch_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 e89eafa074..4acfd1585c 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.c
+++ b/addressbook/gui/search/e-addressbook-search-dialog.c
@@ -25,6 +25,7 @@
 #include <e-util/e-canvas.h>
 #include "e-addressbook-search-dialog.h"
 #include "addressbook/gui/minicard/e-minicard-view-widget.h"
+#include "widgets/misc/e-scroll-frame.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);
@@ -103,7 +104,7 @@ static void
 button_press (GtkWidget *widget, EAddressbookSearchDialog *dialog)
 {
 	char *query;
-	gtk_widget_show(dialog->view);
+	gtk_widget_show(dialog->scrolled_window);
 	query = get_query();
 	gtk_object_set(GTK_OBJECT(dialog->view),
 		       "query", query,
@@ -117,6 +118,8 @@ e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
 	GtkWidget *button;
 	GnomeDialog *dialog = GNOME_DIALOG (view);
 
+	gtk_window_set_policy(GTK_WINDOW(view), FALSE, TRUE, FALSE);
+
 	view->search = get_widget();
 	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->search, TRUE, TRUE, 0);
 	gtk_widget_show(view->search);
@@ -128,7 +131,13 @@ e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)
 	gtk_widget_show(button);
 
 	view->view = e_minicard_view_widget_new();
-	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->view, TRUE, TRUE, 0);
+	gtk_widget_show(view->view);
+
+	view->scrolled_window = e_scroll_frame_new(NULL, NULL);
+	e_scroll_frame_set_policy(E_SCROLL_FRAME(view->scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
+	gtk_container_add(GTK_CONTAINER(view->scrolled_window), view->view);
+	
+	gtk_box_pack_start(GTK_BOX(dialog->vbox), view->scrolled_window, TRUE, TRUE, 0);
 }
 
 GtkWidget *
diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h
index 51ef350afa..84af66b4e1 100644
--- a/addressbook/gui/search/e-addressbook-search-dialog.h
+++ b/addressbook/gui/search/e-addressbook-search-dialog.h
@@ -45,6 +45,7 @@ struct _EAddressbookSearchDialog
 
 	GtkWidget *search;
 	GtkWidget *view;
+	GtkWidget *scrolled_window;
 };
 
 struct _EAddressbookSearchDialogClass