Made dump_tree dump less redundant info (tries not to repeat sections of

	* components/services/install/lib/eazel-install-logic2.c:
	(dump_tree_helper), (dump_tree):

	Made dump_tree dump less redundant info (tries not to repeat
	sections of the graph it's already visited).

	* nautilus-installer/install-lib/Makefile.am:
	* nautilus-installer/libtrilobite/Makefile.am:

	Set LOG_DOMAIN to G_LOG_DOMAIN so our log catcher will actually
	work. :)

	* nautilus-installer/src/Makefile.am:

	Remove redundant object file.

	* nautilus-installer/src/create-eazel-installer.sh:

	By default, strip the installer binary before gzexe'ing it (this
	makes it much much smaller).  Eventually we'll want to add some
	sort of command-line option for deciding which kind to build.

	* nautilus-installer/src/installer.c: (conflict_check),
	(eazel_installer_initialize):

	Remember to nudge GTK+ after updating labels so they'll actually
	refresh.

	* nautilus-installer/src/link.sh:
	* nautilus-installer/src/main.c: (main):
	* nautilus-installer/src/prescript:

	Fix the prescript to work around a sad popt bug.

8 files changed, 18 insertions, 12 deletions

diff --git a/nautilus-installer/install-lib/Makefile.am b/nautilus-installer/install-lib/Makefile.am
index 17fe63bb9..c717e514c 100644
--- a/nautilus-installer/install-lib/Makefile.am
+++ b/nautilus-installer/install-lib/Makefile.am
@@ -24,7 +24,7 @@ libeazelinstall_minimal_a_DEPENDENCIES = $(PACKAGE_SYSTEM_OBJECT)
 INCLUDES=\
 	-DEAZEL_INSTALL_NO_CORBA				\
 	-DEAZEL_INSTALL_SLIM 					\
-	-DLOG_DOMAIN=\"Nautilus-Installer\"			\
+	-DG_LOG_DOMAIN=\"Nautilus-Installer\"			\
 	-I.							\
 	-I@top_srcdir@						\
 	-I/usr/include/rpm					\
diff --git a/nautilus-installer/libtrilobite/Makefile.am b/nautilus-installer/libtrilobite/Makefile.am
index a31298443..33f84ed22 100644
--- a/nautilus-installer/libtrilobite/Makefile.am
+++ b/nautilus-installer/libtrilobite/Makefile.am
@@ -40,7 +40,7 @@ INCLUDES=							\
 	-I@top_srcdir@						\
         -I@top_srcdir@/components/services/trilobite		\
 	-DTRILOBITE_SLIM 					\
-	-DLOG_DOMAIN=\"Nautilus-Installer\"			\
+	-DG_LOG_DOMAIN=\"Nautilus-Installer\"			\
 	@GNOME_CFLAGS@						\
 	@XML_CFLAGS@						\
 	$(NULL)
diff --git a/nautilus-installer/src/Makefile.am b/nautilus-installer/src/Makefile.am
index ca43fb0d1..176ffd9e5 100644
--- a/nautilus-installer/src/Makefile.am
+++ b/nautilus-installer/src/Makefile.am
@@ -58,7 +58,6 @@ CFLAGS = 					\
 eazel_installer_LDFLAGS = -all-static
 
 eazel_installer_LDADD = 	\
-        $(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-distribution.o 	\
 	../install-lib/libeazelinstall_minimal.a			\
 	../libtrilobite/libtrilobite_minimal.a		\
 	$(top_builddir)/libnautilus-extensions/nautilus-druid.o						\
@@ -70,6 +69,7 @@ eazel_installer_LDADD = 	\
 	$(GHTTP_LIBS) \
 	$(XML_LIBS)
 
+#       $(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-distribution.o 	\
 #	$(GNOME_LIBS) \
 #	$(GTK_LIBS) \
 #	$(GLIB_LIBS) \
diff --git a/nautilus-installer/src/create-eazel-installer.sh b/nautilus-installer/src/create-eazel-installer.sh
index 0a652fe1f..7f7eee836 100644
--- a/nautilus-installer/src/create-eazel-installer.sh
+++ b/nautilus-installer/src/create-eazel-installer.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+echo "* Stripping"
+strip eazel-installer
+
 echo "* Packing"
 
 cp eazel-installer hest
@@ -34,3 +37,5 @@ echo "* Patching"
 
 	sed -e '1,2d' -e 's/set -C//' hest
 ) > eazel-installer.sh
+
+rm hest
diff --git a/nautilus-installer/src/installer.c b/nautilus-installer/src/installer.c
index 0fa0635fb..889304bc9 100644
--- a/nautilus-installer/src/installer.c
+++ b/nautilus-installer/src/installer.c
@@ -849,6 +849,10 @@ conflict_check (EazelInstall *service, const PackageData *package, EazelInstalle
 	out = g_strdup_printf (_("Checking \"%s\" for conflicts"), package->name);
 	gtk_label_set_text (GTK_LABEL (label_single), out);
 	g_free (out);
+
+	while (gtk_events_pending ()) {
+		gtk_main_iteration ();
+	}
 }
 
 static void 
@@ -2229,12 +2233,6 @@ eazel_installer_initialize (EazelInstaller *object)
 	if (installer->categories && installer->categories->next) {
 		/* more than one category */
 		for (iterator = installer->categories; iterator; iterator=iterator->next) {
-#if 0
-			/* eventually, it would be nice to go pre-fetch the list of required rpm's.  unfortunately
-			 * the install lib isn't quite ready for that yet.
-			 */
-			eazel_install_fetch_definitive_category_info (installer->service, (CategoryData *)(iterator->data));
-#endif
 			eazel_installer_add_category (installer, (CategoryData*)iterator->data, FALSE);
 			gtk_box_add_padding (vbox, 0, 5);
 		}
diff --git a/nautilus-installer/src/link.sh b/nautilus-installer/src/link.sh
index ecbdbee85..bd23ed841 100755
--- a/nautilus-installer/src/link.sh
+++ b/nautilus-installer/src/link.sh
@@ -143,7 +143,7 @@ rm hest
 if test "$1" = "push" -a $? = 0; then
     echo "Copying installer to /h/public/bin ..."
     if test "$USER" = "robey"; then
-        cp eazel-installer.sh /h/public/bin/
+        cp eazel-installer.sh /h/public/bin/eazel-installer-rpm${RPM_MAJOR}.sh
 	# make it so anyone can write a new one in
 	chmod 777 /h/public/bin/eazel-installer-rpm${RPM_MAJOR}.sh
     else
diff --git a/nautilus-installer/src/main.c b/nautilus-installer/src/main.c
index 4d3c98e47..c602c7528 100644
--- a/nautilus-installer/src/main.c
+++ b/nautilus-installer/src/main.c
@@ -182,7 +182,7 @@ main (int argc, char *argv[])
 			installer_homedir = g_strdup (passwd_entry->pw_dir);
 		} else {
 			/* give up */
-			printf ("*** Unable to find user's homedir: using '/'\n");
+			printf ("*** Unable to find %s's homedir: using '/'\n", installer_user);
 			installer_homedir = g_strdup ("/");
 		}
 	}
diff --git a/nautilus-installer/src/prescript b/nautilus-installer/src/prescript
index 34778b380..36a4441b5 100644
--- a/nautilus-installer/src/prescript
+++ b/nautilus-installer/src/prescript
@@ -65,7 +65,10 @@ if test $UID -ne 0 -a "x$QUICK" '!=' "xyes"; then
 else
     if test "x$botan_rice_candy" = "x"; then
         # running as root, or has "--{version|build|help}" command-line option
-	/bin/sh -c "$params && $export && cd $PWD && /bin/sh $0 $* --user $USER"
+        # note that the --user option has to be of the '=' variety because of
+        # a bug in popt. (if any of the user args use the '=' form, a final
+        # non-'=' ['--user arg'] option silently corrupts argv.)
+	/bin/sh -c "$params && $export && cd $PWD && /bin/sh $0 $* --user=$USER"
 	exit
     fi
 fi