Added fixme

	* components/services/nautilus-dependent-shared/shared-service-widg
	ets.c:
	Added fixme

	* components/mozilla/main.c: (main):
	* components/services/summary/nautilus-view/main.c: (main):

	Cleaned up the ammonite/gconf initialization mess.  gconf should
	always be initialized before ammonite, and ammonite should always be
	initizalized if you're going to use it.

5 files changed, 36 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d0115d7b..ccc5fd5d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-12-19  Mike Fleming  <mfleming@eazel.com>
+
+	* components/services/nautilus-dependent-shared/shared-service-widg
+	ets.c:
+	Added fixme
+
+	* components/mozilla/main.c: (main):
+	* components/services/summary/nautilus-view/main.c: (main):
+
+	Cleaned up the ammonite/gconf initialization mess.  gconf should
+	always be initialized before ammonite, and ammonite should always be
+	initizalized if you're going to use it.
+
 2000-12-19  Ramiro Estrugo  <ramiro@eazel.com>
 
 	reviewed by: Maciej Stachowiak <mjs@eazel.com>
diff --git a/components/mozilla/main.c b/components/mozilla/main.c
index db0dd96ec..b0236e619 100644
--- a/components/mozilla/main.c
+++ b/components/mozilla/main.c
@@ -33,6 +33,8 @@
 #include <liboaf/liboaf.h>
 #include <bonobo.h>
 
+#include <gconf/gconf.h>
+
 #ifdef EAZEL_SERVICES
 #include <libtrilobite/libammonite-gtk.h>
 #endif
@@ -95,6 +97,8 @@ main (int argc, char *argv[])
 	BonoboGenericFactory *factory;
 	CORBA_ORB orb;
 	char *registration_id;
+	GError *error_gconf = NULL;
+	char *fake_argv[] = { "nautilus-mozilla-content-view", NULL };
 
 	if (argc == 2 && 0 == strcmp (argv[1], "--self-test")) {
 		gboolean success;
@@ -111,7 +115,13 @@ main (int argc, char *argv[])
 	orb = oaf_init (argc, argv);
 	
 	bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
-	
+
+	/* the fake_argv thing is just superstition.  I just don't
+	 * want gconf mucking with my args
+	 */
+	if (!gconf_init (1, fake_argv, &error_gconf)) {
+		g_warning ("Couldn't init gconf");
+	}
 	
         registration_id = oaf_make_registration_id ("OAFIID:nautilus_mozilla_content_view_factory:020a0285-6b96-4685-84a1-4a56eb6baa2b", getenv ("DISPLAY"));
 	factory = bonobo_generic_factory_new_multi (registration_id, 
@@ -125,7 +135,7 @@ main (int argc, char *argv[])
 	if (ammonite_init ((PortableServer_POA) bonobo_poa)) {
 		nautilus_mozilla_content_view_user_control = ammonite_get_user_control ();
 	}
-#endif 
+#endif
 
 #ifdef DEBUG_mfleming
 	g_print ("OAF registration complete.\n");
diff --git a/components/services/nautilus-dependent-shared/shared-service-widgets.c b/components/services/nautilus-dependent-shared/shared-service-widgets.c
index 94382b0e9..842ee1679 100644
--- a/components/services/nautilus-dependent-shared/shared-service-widgets.c
+++ b/components/services/nautilus-dependent-shared/shared-service-widgets.c
@@ -112,6 +112,11 @@ create_image_widget (const char *icon_name, const char *tile_icon_name)
 
 /* create and return an image widget from a uri and a tiled background.
    It also pins the image to the specified dimensions */
+
+/* FIXME bugzilla.eazel.com 5138
+ * this calls gnome-vfs synchronously for an HTTP uri and thus can block
+ * the UI indefinitely
+ */
 GtkWidget*
 create_image_widget_from_uri (const char *uri, const char *tile_icon_name,
 			      int max_width, int max_height)
diff --git a/components/services/summary/main.c b/components/services/summary/main.c
index e7dc26e18..324b96b73 100644
--- a/components/services/summary/main.c
+++ b/components/services/summary/main.c
@@ -30,6 +30,7 @@
 #include <bonobo.h>
 #include "nautilus-summary-view.h"
 #include <gconf/gconf.h>
+#include <libtrilobite/libammonite.h>
 
 static int object_count =0;
 
@@ -91,6 +92,8 @@ main (int argc, char *argv[])
 
 	gconf_init (argc, argv, NULL);
 
+	ammonite_init (bonobo_poa());
+	
         registration_id = oaf_make_registration_id ("OAFIID:nautilus_summary_view_factory:1b0b1018-e0ca-4f14-8d23-7a134486ab30", getenv ("DISPLAY"));
 
 	factory = bonobo_generic_factory_new_multi (registration_id, 
diff --git a/components/services/summary/nautilus-view/main.c b/components/services/summary/nautilus-view/main.c
index e7dc26e18..324b96b73 100644
--- a/components/services/summary/nautilus-view/main.c
+++ b/components/services/summary/nautilus-view/main.c
@@ -30,6 +30,7 @@
 #include <bonobo.h>
 #include "nautilus-summary-view.h"
 #include <gconf/gconf.h>
+#include <libtrilobite/libammonite.h>
 
 static int object_count =0;
 
@@ -91,6 +92,8 @@ main (int argc, char *argv[])
 
 	gconf_init (argc, argv, NULL);
 
+	ammonite_init (bonobo_poa());
+	
         registration_id = oaf_make_registration_id ("OAFIID:nautilus_summary_view_factory:1b0b1018-e0ca-4f14-8d23-7a134486ab30", getenv ("DISPLAY"));
 
 	factory = bonobo_generic_factory_new_multi (registration_id,