Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gtk+/tests/Makefile.am,v
retrieving revision 1.47
diff -p -u -u -p -r1.47 Makefile.am
--- Makefile.am	11 Feb 2005 07:15:10 -0000	1.47
+++ Makefile.am	11 Oct 2005 18:04:31 -0000
@@ -154,6 +154,10 @@ pixbuf_threads_LDADD = $(LDADDS) $(GLIB_
 testmerge_LDADD = $(LDADDS)
 testactions_LDADD = $(LDADDS)
 
+testentrycompletion_SOURCES = 	\
+	prop-editor.c		\
+	testentrycompletion.c
+
 testfilechooser_SOURCES = 	\
 	prop-editor.c		\
 	testfilechooser.c 	
Index: testentrycompletion.c
===================================================================
RCS file: /cvs/gnome/gtk+/tests/testentrycompletion.c,v
retrieving revision 1.11.2.1
diff -p -u -u -p -r1.11.2.1 testentrycompletion.c
--- testentrycompletion.c	13 Sep 2005 15:11:43 -0000	1.11.2.1
+++ testentrycompletion.c	11 Oct 2005 18:04:31 -0000
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
+#include "prop-editor.h"
+
 /* Don't copy this bad example; inline RGB data is always a better
  * idea than inline XPMs.
  */
@@ -288,6 +290,27 @@ match_selected_cb (GtkEntryCompletion *c
   return TRUE;
 }
 
+static void
+new_prop_editor (GObject *object)
+{
+	gtk_widget_show (create_prop_editor (object, G_OBJECT_TYPE (object)));
+}
+
+static void
+add_with_prop_edit_button (GtkWidget *vbox, GtkWidget *entry, GtkEntryCompletion *completion)
+{
+	GtkWidget *hbox, *button;
+
+	hbox = gtk_hbox_new (FALSE, 12);
+	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+
+	gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+
+	button = gtk_button_new_with_label ("Properties");
+	g_signal_connect_swapped (button, "clicked", G_CALLBACK (new_prop_editor), completion);
+	gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+}
+
 int 
 main (int argc, char *argv[])
 {
@@ -316,7 +339,6 @@ main (int argc, char *argv[])
 
   /* Create our first entry */
   entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
   
   /* Create the completion object */
   completion = gtk_entry_completion_new ();
@@ -325,6 +347,8 @@ main (int argc, char *argv[])
   gtk_entry_set_completion (GTK_ENTRY (entry), completion);
   g_object_unref (completion);
   
+  add_with_prop_edit_button (vbox, entry, completion);
+
   /* Create a tree model and use it as the completion model */
   completion_model = create_simple_completion_model ();
   gtk_entry_completion_set_model (completion, completion_model);
@@ -335,7 +359,6 @@ main (int argc, char *argv[])
 
   /* Create our second entry */
   entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
 
   /* Create the completion object */
   completion = gtk_entry_completion_new ();
@@ -344,6 +367,8 @@ main (int argc, char *argv[])
   gtk_entry_set_completion (GTK_ENTRY (entry), completion);
   g_object_unref (completion);
   
+  add_with_prop_edit_button (vbox, entry, completion);
+
   /* Create a tree model and use it as the completion model */
   completion_model = create_completion_model ();
   gtk_entry_completion_set_model (completion, completion_model);
@@ -371,7 +396,6 @@ main (int argc, char *argv[])
 
   /* Create our third entry */
   entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
 
   /* Create the completion object */
   completion = gtk_entry_completion_new ();
@@ -380,6 +404,8 @@ main (int argc, char *argv[])
   gtk_entry_set_completion (GTK_ENTRY (entry), completion);
   g_object_unref (completion);
   
+  add_with_prop_edit_button (vbox, entry, completion);
+
   /* Create a tree model and use it as the completion model */
   completion_model = GTK_TREE_MODEL (gtk_list_store_new (1, G_TYPE_STRING));
 
@@ -396,7 +422,6 @@ main (int argc, char *argv[])
   gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Model-less entry completion"), FALSE, FALSE, 0);
 
   entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
 
   /* Create the completion object */
   completion = gtk_entry_completion_new ();
@@ -405,6 +430,8 @@ main (int argc, char *argv[])
   gtk_entry_set_completion (GTK_ENTRY (entry), completion);
   g_object_unref (completion);
   
+  add_with_prop_edit_button (vbox, entry, completion);
+
   gtk_widget_show_all (window);
 
   gtk_main ();
