sync for debugging with chris

svn path=/trunk/; revision=2044

4 files changed, 25 insertions, 7 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index ce03474523..e2f211ba3a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,11 @@
+2000-03-04  bertrand  <bertrand@helixcode.com>
+
+	* test-mail.c (main): replace the bonobo-active/gtk-main
+	by bonobo-main.
+	Include Gnorba headers.
+	(main): don't call the container creation routine 
+	before we entered the main loop. Use idle for that.
+
 2000-03-04  Christopher James Lahey  <clahey@helixcode.com>
 
 	* message-list.c: Change this to use the ETable widget itself
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index dc5afb79a6..2663480f8d 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -35,16 +35,19 @@ folder_browser_factory (BonoboGenericFactory *factory, void *closure)
 	folder_browser_set_uri (FOLDER_BROWSER (folder_browser), "inbox");
 	
 	control = bonobo_control_new (folder_browser);
+	
 	if (control == NULL){
 		gtk_object_destroy (GTK_OBJECT (folder_browser));
 		return NULL;
 	}
 	
-	bonobo_control_set_property_bag (
+	
+	/*bonobo_control_set_property_bag (
 		control,
-		FOLDER_BROWSER (folder_browser)->properties);
+		FOLDER_BROWSER (folder_browser)->properties);*/
 
 	return BONOBO_OBJECT (control);
+
 }
 
 void
diff --git a/mail/message-list.c b/mail/message-list.c
index 8e6d4dbaa3..88c99f735b 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -66,6 +66,7 @@ ml_row_count (ETableModel *etm, void *data)
 
 	ex = camel_exception_new ();
 	v = camel_folder_get_message_count (message_list->folder, ex);
+	printf ("number of messages in the folder = %d\n", v);
 	camel_exception_free (ex);
 	
 	return v;
@@ -332,6 +333,7 @@ message_list_init (GtkObject *object)
 
 	message_list_init_renderers (message_list);
 	message_list_init_header (message_list);
+	printf ("headers intialized\n");
 
 	/*
 	 * The etable
diff --git a/mail/test-mail.c b/mail/test-mail.c
index 1f8b217ce5..df9bd3dbcc 100644
--- a/mail/test-mail.c
+++ b/mail/test-mail.c
@@ -8,8 +8,9 @@
  */
 #include <gnome.h>
 #include <bonobo.h>
+#include <libgnorba/gnorba.h>
 
-static void
+static guint
 create_container (void)
 {
 	GtkWidget *window, *control;
@@ -20,8 +21,9 @@ create_container (void)
 
 	uih = bonobo_ui_handler_new ();
 	control = bonobo_widget_new_control ("GOADID:Evolution:FolderBrowser:1.0",
-					     bonobo_object_corba_objref (BONOBO_OBJECT (uih)));
+				     bonobo_object_corba_objref (BONOBO_OBJECT (uih)));
 
+	
 	if (control == NULL){
 		printf ("Could not launch mail control\n");
 		exit (1);
@@ -30,6 +32,9 @@ create_container (void)
 
 	gtk_widget_show (window);
 	gtk_widget_show (control);
+
+
+	return FALSE;
 }
 
 int
@@ -49,14 +54,14 @@ main (int argc, char *argv [])
 	if (bonobo_init (orb, NULL, NULL) == FALSE)
 		g_error ("Could not initialize Bonobo\n");
 
-	bonobo_activate ();
 	
-	create_container ();
+	
+	gtk_idle_add ((GtkFunction) create_container, NULL);
 
 	/*
 	 * Main loop
 	 */
-	gtk_main ();
+	bonobo_main ();
 	
 	return 0;
 }