Inspired by a patch from Jacob Berkman <jacob@ximian.com>, got

	rid of all the Makefile.am hackery so that everything ends up in
	the tarball.

	* configure.in: Bumped version to 1.1.1.

	* components/Makefile.am: Re-enabled all the subdirs.

	* components/adapter/Makefile.am: Re-enabled
	nautilus-adapter-embeddable-embed-strategy.[ch].

	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
	Put an #if GNOME2_CONVERSION_COMPLETE around the whole thing.

	* components/loser/content/Makefile.am:
	* components/loser/sidebar/Makefile.am:
	Update for COMPONENT_CFLAGS in NAUTILUS_PRIVATE_CFLAGS.

	* components/loser/content/main.c: (loser_make_object), (main):
	* components/loser/sidebar/main.c: (loser_make_object), (main):
	* components/loser/content/nautilus-content-loser.c:
	(nautilus_content_loser_init):
	* components/loser/sidebar/nautilus-sidebar-loser.c:
	(nautilus_sidebar_loser_init):
	Make these compile, not sure if they actually work.

	* components/shell/Nautilus_View_shell.server.in: Remove.
	* components/shell/shell.c: Remove.
	This component can go in a separate package -- it doesn't need to be
	part of the main Nautilus source tree.

	* components/text/Makefile.am: Turned off compiling of the component,
	but used EXTRA_DIST to make sure the source code still gets into the
	tarball.

	* components/tree/Makefile.am: Removed $(COMPONENT_LIBS) from the
	libnautilus_tree_view_la_SOURCES list. Not sure why it was in there.

	* libnautilus-private/Makefile.am: Remove stale references to the
	nautilus-druid-related headers.

	* libnautilus/nautilus-view-standard-main.c:
	(nautilus_view_standard_main_multi): Remove some
	GNOME2_CONVERSION_COMPLETE code that is now clearly not going to
	be needed. Left in the stuff that is a placeholder for things we
	still need.

	* src/Makefile.am: Distribute the profiler sources even when they are
	not built.

	* libnautilus-private/nautilus-icon-container.c: Whitespace tweak.

14 files changed, 74 insertions, 189 deletions

diff --git a/components/Makefile.am b/components/Makefile.am
index 59b6d8bec..e4fdc325a 100644
--- a/components/Makefile.am
+++ b/components/Makefile.am
@@ -2,18 +2,15 @@ NULL=
 
 SUBDIRS = 					\
 	adapter                                 \
+	hardware 				\
 	history 				\
 	image-viewer 				\
+	loser 					\
 	music					\
 	news					\
 	notes 					\
 	sample 					\
+	text 					\
 	throbber 				\
 	tree 					\
 	$(NULL)
-
-XXX=
-	hardware 				\
-	loser 					\
-	text 					\
-	$(NULL)
diff --git a/components/adapter/Makefile.am b/components/adapter/Makefile.am
index 6f7b87f97..c912c07bc 100644
--- a/components/adapter/Makefile.am
+++ b/components/adapter/Makefile.am
@@ -27,6 +27,8 @@ nautilus_adapter_SOURCES =				\
 	nautilus-adapter-embed-strategy-private.h	\
 	nautilus-adapter-embed-strategy.c		\
 	nautilus-adapter-embed-strategy.h		\
+	nautilus-adapter-embeddable-embed-strategy.c	\
+	nautilus-adapter-embeddable-embed-strategy.h	\
 	nautilus-adapter-factory-server.c		\
 	nautilus-adapter-factory-server.h		\
 	nautilus-adapter-file-load-strategy.c		\
@@ -42,11 +44,6 @@ nautilus_adapter_SOURCES =				\
 	nautilus-adapter.h				\
 	$(NULL)
 
-XXX =  \
-	nautilus-adapter-embeddable-embed-strategy.c	\
-	nautilus-adapter-embeddable-embed-strategy.h	\
-	$(NULL)
-
 nautilus_adapter_LDADD =							\
 	$(top_builddir)/libnautilus/libnautilus.la				\
 	$(top_builddir)/libnautilus-adapter/libnautilus-adapter.la		\
diff --git a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c
index f7fd7ce3a..617ca5018 100644
--- a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c
@@ -27,14 +27,14 @@
 /* nautilus-adapter-embeddable-embed-strategy.c - 
  */
 
-
 #include <config.h>
-
 #include "nautilus-adapter-embeddable-embed-strategy.h"
+
+#if GNOME2_CONVERSION_COMPLETE
+
 #include "nautilus-adapter-embed-strategy-private.h"
 #include "nautilus-zoomable-proxy.h"
 
-#include <bonobo/bonobo-client-site.h>
 #include <bonobo/bonobo-item-container.h>
 #include <gtk/gtksignal.h>
 #include <eel/eel-gtk-macros.h>
@@ -230,4 +230,4 @@ nautilus_adapter_embeddable_embed_strategy_get_zoomable (NautilusAdapterEmbedStr
 	return strategy->details->zoomable;
 }
 
-
+#endif
diff --git a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c
index f7fd7ce3a..617ca5018 100644
--- a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c
@@ -27,14 +27,14 @@
 /* nautilus-adapter-embeddable-embed-strategy.c - 
  */
 
-
 #include <config.h>
-
 #include "nautilus-adapter-embeddable-embed-strategy.h"
+
+#if GNOME2_CONVERSION_COMPLETE
+
 #include "nautilus-adapter-embed-strategy-private.h"
 #include "nautilus-zoomable-proxy.h"
 
-#include <bonobo/bonobo-client-site.h>
 #include <bonobo/bonobo-item-container.h>
 #include <gtk/gtksignal.h>
 #include <eel/eel-gtk-macros.h>
@@ -230,4 +230,4 @@ nautilus_adapter_embeddable_embed_strategy_get_zoomable (NautilusAdapterEmbedStr
 	return strategy->details->zoomable;
 }
 
-
+#endif
diff --git a/components/loser/content/Makefile.am b/components/loser/content/Makefile.am
index 835dba63c..297997b15 100644
--- a/components/loser/content/Makefile.am
+++ b/components/loser/content/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES =					\
 	-DDATADIR=\"$(datadir)\"		\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
 	-I$(top_srcdir)				\
-	$(NAUTILUS_PRIVATE_CFLAGS) \
+	$(COMPONENT_CFLAGS) \
 	$(NULL)
 
 uidir = $(datadir)/gnome-2.0/ui
@@ -21,7 +21,7 @@ nautilus_content_loser_SOURCES =		\
 
 nautilus_content_loser_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
-	$(NAUTILUS_PRIVATE_LIBS) \
+	$(COMPONENT_LIBS) \
 	$(NULL)
 
 serverdir = $(libdir)/bonobo/servers
diff --git a/components/loser/content/main.c b/components/loser/content/main.c
index 817c01618..0043eddc1 100644
--- a/components/loser/content/main.c
+++ b/components/loser/content/main.c
@@ -62,7 +62,7 @@ loser_make_object (BonoboGenericFactory *factory,
 
 	nautilus_view = nautilus_content_loser_get_nautilus_view (view);
 
-	g_signal_connect (nautilus_view, "destroy", loser_object_destroyed, NULL);
+	g_signal_connect (nautilus_view, "destroy", G_CALLBACK (loser_object_destroyed), NULL);
 
 	nautilus_content_loser_maybe_fail ("post-make-object");
 
@@ -72,36 +72,39 @@ loser_make_object (BonoboGenericFactory *factory,
 int main(int argc, char *argv[])
 {
 	BonoboGenericFactory *factory;
-	CORBA_ORB orb;
 	CORBA_Environment ev;
+#if GNOME2_CONVERSION_COMPLETE
 	char *registration_id;
+#endif
 
 	CORBA_exception_init(&ev);
 
 	nautilus_content_loser_maybe_fail ("pre-init");
 
+#if GNOME2_CONVERSION_COMPLETE
 	gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
-	orb = bonobo_activation_init (argc, argv);
-
-        gnome_init ("nautilus-content-loser", VERSION, 
-		    argc, argv); 
-
-	bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
+#endif
+	bonobo_ui_init ("nautilus-content-loser", VERSION, &argc, argv);
 
 	nautilus_content_loser_maybe_fail ("post-init");
 
+#if GNOME2_CONVERSION_COMPLETE
         registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69", getenv ("DISPLAY"));
-	factory = bonobo_generic_factory_new_multi (registration_id, 
-						    loser_make_object,
-						    NULL);
+#endif
+	factory = bonobo_generic_factory_new ("OAFIID:nautilus_content_loser_factory:adf30e75-3b63-4360-8784-a8e239390a69", 
+					      loser_make_object,
+					      NULL);
+#if GNOME2_CONVERSION_COMPLETE
 	g_free (registration_id);
-
+#endif
 		
 	nautilus_content_loser_maybe_fail ("post-factory-init");
 
-	do {
-		bonobo_main ();
-	} while (object_count > 0);
-	
+	if (factory != NULL) {
+		do {
+			bonobo_main ();
+		} while (object_count > 0);
+	}
+
 	return 0;
 }
diff --git a/components/loser/content/nautilus-content-loser.c b/components/loser/content/nautilus-content-loser.c
index d9b89c413..5b2ca5ac2 100644
--- a/components/loser/content/nautilus-content-loser.c
+++ b/components/loser/content/nautilus-content-loser.c
@@ -29,12 +29,12 @@
 #include "nautilus-content-loser.h"
 
 #include <bonobo/bonobo-control.h>
-#include <gtk/gtksignal.h>
+#include <eel/eel-gtk-macros.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
-#include <eel/eel-gtk-macros.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -85,9 +85,9 @@ nautilus_content_loser_init (NautilusContentLoser *view)
 	/* Get notified when our bonobo control is activated so we
 	 * can merge menu & toolbar items into Nautilus's UI.
 	 */
-        g_signal_connect (nautilus_view_get_bonobo_control (view->details->nautilus_view)),
+        g_signal_connect (nautilus_view_get_bonobo_control (view->details->nautilus_view),
                           "activate",
-                          loser_merge_bonobo_items_callback,
+                          G_CALLBACK (loser_merge_bonobo_items_callback),
                           view);
 	
 	gtk_widget_show (GTK_WIDGET (view));
@@ -226,8 +226,8 @@ loser_merge_bonobo_items_callback (BonoboObject *control, gboolean state, gpoint
          */
 }
 
-static char *failure_mode = NULL;
-static char *failure_point = NULL;
+static const char *failure_mode = NULL;
+static const char *failure_point = NULL;
 static gboolean env_checked = FALSE;
 
 void
diff --git a/components/loser/sidebar/Makefile.am b/components/loser/sidebar/Makefile.am
index e63a00bd7..b65a1c309 100644
--- a/components/loser/sidebar/Makefile.am
+++ b/components/loser/sidebar/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES =					\
 	-DDATADIR=\"$(datadir)\"		\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
 	-I$(top_srcdir)				\
-	$(NAUTILUS_PRIVATE_CFLAGS) \
+	$(COMPONENT_CFLAGS) \
 	$(NULL)
 
 uidir = $(datadir)/gnome-2.0/ui
@@ -21,7 +21,7 @@ nautilus_sidebar_loser_SOURCES =		\
 
 nautilus_sidebar_loser_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
-	$(NAUTILUS_PRIVATE_LIBS) \
+	$(COMPONENT_LIBS) \
 	$(NULL)
 
 serverdir = $(libdir)/bonobo/servers
diff --git a/components/loser/sidebar/main.c b/components/loser/sidebar/main.c
index 797ffd99f..e64a9fc6e 100644
--- a/components/loser/sidebar/main.c
+++ b/components/loser/sidebar/main.c
@@ -62,7 +62,7 @@ loser_make_object (BonoboGenericFactory *factory,
 
 	nautilus_view = nautilus_sidebar_loser_get_nautilus_view (view);
 
-	g_signal_connect (nautilus_view, "destroy", loser_object_destroyed, NULL);
+	g_signal_connect (nautilus_view, "destroy", G_CALLBACK (loser_object_destroyed), NULL);
 
 	nautilus_sidebar_loser_maybe_fail ("post-make-object");
 
@@ -72,37 +72,40 @@ loser_make_object (BonoboGenericFactory *factory,
 int main(int argc, char *argv[])
 {
 	BonoboGenericFactory *factory;
-	CORBA_ORB orb;
 	CORBA_Environment ev;
+#if GNOME2_CONVERSION_COMPLETE
 	char *registration_id;
+#endif
 
-	CORBA_exception_init(&ev);
+	CORBA_exception_init (&ev);
 
 	nautilus_sidebar_loser_maybe_fail ("pre-init");
 
+#if GNOME2_CONVERSION_COMPLETE
 	gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
-	orb = bonobo_activation_init (argc, argv);
+#endif
 
-        gnome_init ("nautilus-sidebar-loser", VERSION, 
-		    argc, argv); 
+        bonobo_ui_init ("nautilus-sidebar-loser", VERSION, &argc, argv); 
 	
-	bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
-
 	nautilus_sidebar_loser_maybe_fail ("post-init");
 
-
+#if GNOME2_CONVERSION_COMPLETE
         registration_id = bonobo_activation_make_registration_id ("OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa", getenv ("DISPLAY"));
-	factory = bonobo_generic_factory_new_multi (registration_id, 
-						    loser_make_object,
-						    NULL);
+#endif
+	factory = bonobo_generic_factory_new ("OAFIID:nautilus_sidebar_loser_factory:5d9aadfa-a8a4-4ec0-8332-d6f806c211fa", 
+					      loser_make_object,
+					      NULL);
+#if GNOME2_CONVERSION_COMPLETE
 	g_free (registration_id);
-
+#endif
 
 	nautilus_sidebar_loser_maybe_fail ("post-factory-init");
 
-	do {
-		bonobo_main ();
-	} while (object_count > 0);
+	if (factory != NULL) {
+		do {
+			bonobo_main ();
+		} while (object_count > 0);
+	}
 	
 	return 0;
 }
diff --git a/components/loser/sidebar/nautilus-sidebar-loser.c b/components/loser/sidebar/nautilus-sidebar-loser.c
index 123699e63..1ac18d880 100644
--- a/components/loser/sidebar/nautilus-sidebar-loser.c
+++ b/components/loser/sidebar/nautilus-sidebar-loser.c
@@ -88,9 +88,9 @@ nautilus_sidebar_loser_init (NautilusSidebarLoser *view)
 	 * Get notified when our bonobo control is activated so we
 	 * can merge menu & toolbar items into Nautilus's UI.
 	 */
-        g_signal_connect (nautilus_view_get_bonobo_control (view->details->nautilus_view)),
+        g_signal_connect (nautilus_view_get_bonobo_control (view->details->nautilus_view),
                           "activate",
-                          loser_merge_bonobo_items_callback,
+                          G_CALLBACK (loser_merge_bonobo_items_callback),
                           view);
 	
 	gtk_widget_show (GTK_WIDGET (view));
@@ -229,8 +229,8 @@ loser_merge_bonobo_items_callback (BonoboObject *control, gboolean state, gpoint
          */
 }
 
-static char *failure_mode = NULL;
-static char *failure_point = NULL;
+static const char *failure_mode = NULL;
+static const char *failure_point = NULL;
 static gboolean env_checked = FALSE;
 
 void
diff --git a/components/shell/Nautilus_View_shell.server.in b/components/shell/Nautilus_View_shell.server.in
deleted file mode 100644
index c89ef365a..000000000
--- a/components/shell/Nautilus_View_shell.server.in
+++ /dev/null
@@ -1,28 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:shell_factory:10a7d344-c4cd-402f-9e05-bd591bbc5618" type="exe" location="xterm-control-factory">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:GNOME/ObjectFactory:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" value="Martin-Demo-Hack"/>
-	<oaf_attribute name="description" type="string" value="Martin-Demo-Hack Factory"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:shell:82521e29-d9b4-40df-8b2b-35ffd45a6515" type="factory" location="OAFIID:shell_factory:10a7d344-c4cd-402f-9e05-bd591bbc5618">
-	<oaf_attribute name="repo_ids" type="stringv">
-		<item value="IDL:Bonobo/Unknown:1.0"/>
-		<item value="IDL:Bonobo/Control:1.0"/>
-		<item value="IDL:Nautilus/View:1.0"/>
-	</oaf_attribute>
-	<oaf_attribute name="name" type="string" value="Martin-Demo-Hack"/>
-	<oaf_attribute name="description" type="string" value="Martin-Demo-Hack"/>
-	<oaf_attribute name="bonobo:supported_mime_types" type="stringv">
-		<item value="x-directory/normal"/>
-	</oaf_attribute>
-	<oaf_attribute name="nautilus:view_as_name" type="string" value="Shell"/>
-	<oaf_attribute name="nautilus:view_as_label" type="string" value="View as Shell"/>
-	<oaf_attribute name="nautilus:viewer_label" type="string" value="Shell Viewer"/>
-</oaf_server>
-
-</oaf_info>
-
diff --git a/components/shell/shell.c b/components/shell/shell.c
deleted file mode 100644
index 9de44a090..000000000
--- a/components/shell/shell.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <errno.h>
-#include <bonobo-activation/bonobo-activation.h>
-#include <gnome.h>
-#include <bonobo.h>
-#include <zvt/zvtterm.h>
-
-#include <popt.h>
-extern struct poptOption bonobo_activation_popt_options[];
-
-static BonoboObject *
-shell_factory (BonoboGenericFactory *Factory, void *closure)
-{
-    BonoboControl	*control;
-    GtkWidget		*zvtterm;
-    int			pid;
-
-    /* Create the control. */
-    zvtterm = zvt_term_new_with_size (80, 24);
-    gtk_widget_show (zvtterm);
-
-    pid = zvt_term_forkpty (ZVT_TERM (zvtterm), 0);
-    if (pid == 0) {
-      execl ("/bin/bash", "-bash", NULL);
-      fprintf (stderr, "ERROR: %s\n", strerror (errno));
-      exit (1);
-    }
-
-    control = bonobo_control_new (zvtterm);
-
-    return BONOBO_OBJECT (control);
-}
-
-void
-shell_factory_init (void)
-{
-    static BonoboGenericFactory *xterm_factory = NULL;
-    char *registration_id;
-
-    if (xterm_factory != NULL)
-	return;
-
-    registration_id = bonobo_activation_make_registration_id (, g_getenv ("DISPLAY"));
-    factory = bonobo_generic_factory_new_multi "OAFIID:shell_factory:10a7d344-c4cd-402f-9e05-bd591bbc5618", shell_factory, NULL);
-    g_free (registration_id);
-
-
-    if (xterm_factory == NULL)
-	g_error ("I could not register a Factory.");
-}
-
-CORBA_Environment ev;
-CORBA_ORB orb;
-
-static void
-init_bonobo (int argc, char **argv)
-{
-    /* Disable session manager connection */
-    gnome_client_disable_master_connection ();
-
-    gnomelib_register_popt_table (bonobo_activation_popt_options, bonobo_activation_get_popt_table_name ());
-    orb = bonobo_activation_init (argc, argv);
-
-    gnome_init_with_popt_table ("xterm-control-factory", "0.0",
-				argc, argv);
-    gdk_rgb_init ();
-
-    if (!bonobo_init (orb, NULL, NULL))
-	g_error (_("Could not initialize Bonobo"));
-}
-
-int
-main (int argc, char **argv)
-{
-    CORBA_exception_init (&ev);
-
-    init_bonobo (argc, argv);
-
-    shell_factory_init ();
-
-    bonobo_main ();
-
-    return 0;
-}
diff --git a/components/text/Makefile.am b/components/text/Makefile.am
index 4609e9e00..7a83d9097 100644
--- a/components/text/Makefile.am
+++ b/components/text/Makefile.am
@@ -11,31 +11,28 @@ INCLUDES =					\
 	-DGTK_ENABLE_BROKEN			\
 	$(NULL)
 
-bin_PROGRAMS =					\
-	nautilus-text-view
+# bin_PROGRAMS = nautilus-text-view
 
 nautilus_text_view_SOURCES =		        \
 	nautilus-text-view.c			\
 	nautilus-text-view.h			\
 	main.c
 
-nautilus_text_view_LDADD =			\
-	$(top_builddir)/libnautilus/libnautilus.la	\
-	$(top_builddir)/libnautilus-private/libnautilus-private.la \
-	$(COMPONENT_LIBS)	\
-	$(NULL)
+#nautilus_text_view_LDADD =			\
+#	$(top_builddir)/libnautilus/libnautilus.la	\
+#	$(top_builddir)/libnautilus-private/libnautilus-private.la \
+#	$(COMPONENT_LIBS)			\
+#	$(NULL)
 
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = nautilus-text-view-ui.xml
 
 serverdir = $(libdir)/bonobo/servers
-server_in_files =					\
+server_in_files =				\
 	Nautilus_View_text.server.in		\
 	$(NULL)
-server_DATA = $(server_in_files:.server.in=.server)
+# server_DATA = $(server_in_files:.server.in=.server)
 
 @INTLTOOL_SERVER_RULE@
 
-EXTRA_DIST = $(server_in_files) $(server_DATA) $(ui_DATA) 
-
-
+EXTRA_DIST = $(server_in_files) $(nautilus_text_view_SOURCES)
diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am
index f079868e4..5e8639e98 100644
--- a/components/tree/Makefile.am
+++ b/components/tree/Makefile.am
@@ -30,7 +30,6 @@ lib_LTLIBRARIES =			\
 
 libnautilus_tree_view_la_SOURCES =         \
 	$(TREE_VIEW_COMMON_SOURCES)        \
-	$(COMPONENT_LIBS)		   \
 	libmain.c                          \
 	$(NULL)