Added --query, to test the corba query stuff

	* components/services/install/command-line/eazel-alt-install-corba.c:
	(main):
	Added --query, to test the corba query stuff

	* components/services/install/command-line/eazel-package-query.c:
	Removed some erratic #defs.

	* components/services/install/command-line/genpkg_list.example:
	Now has an error on purpose, to test the error checking

	* components/services/install/idl/trilobite-eazel-install.idl:
	Renamed the query to simple_query

	* components/services/install/lib/eazel-install-corba-callback.c:
	(impl_install_failed), (impl_uninstall_failed),
	(eazel_install_callback_simple_query),
	(eazel_install_callback_revert_transaction):
	* components/services/install/lib/eazel-install-corba-callback.h:
	* components/services/install/lib/eazel-install-corba-types.c:
	(corba_packagedatastruct_from_packagedata):
	* components/services/install/lib/eazel-install-corba.c:
	(impl_Eazel_Install_simple_query), (eazel_install_get_epv):
	* components/services/install/lib/eazel-install-query.c:
	(eazel_install_simple_rpm_query), (eazel_install_simple_query):
	Finished the corbafication of simple_query and added some const's
	to some arguments.

	* components/services/install/lib/eazel-install-protocols.c:
	(http_fetch_remote_file):
	Fixed a bug where the first download-progress emit got called with
	total == 0.

	* components/services/install/lib/eazel-install-query.h:
	Removed debug output.

	* components/services/install/lib/eazel-install-rpm-glue.c:
	(eazel_install_do_rpm_transaction_process_pipe),
	(eazel_install_do_rpm_transaction_save_report),
	(do_rpm_transaction), (eazel_install_fetch_rpm_dependencies):
	Am tryink to fix the installer. Havink problems reading the output
	from rpm, since it apparently gets buffered somewhere.

	* components/services/install/lib/eazel-install-xml-package-list.c:
	(generate_xml_package_list):
	Added error checking to the :-seperated values parsing.

	* components/services/install/lib/makefile.staticlib.in:
	More static linking fun.

	* nautilus-installer/src/Makefile:
	* nautilus-installer/src/Makefile.am:
	* nautilus-installer/src/installer.c: (eazel_install_progress),
	(eazel_download_progress), (download_failed),
	(eazel_install_preflight), (eazel_install_dep_check),
	(eazel_install_delete_files), (installer):
	* nautilus-installer/src/interface.c: (create_window):
	* nautilus-installer/src/link.sh:
	* nautilus-installer/src/prescript:
	Okaeh, the installer is slight prettier, but the install progress
	is screwed because of the problem with progress bar.

6 files changed, 209 insertions, 63 deletions

diff --git a/nautilus-installer/src/Makefile b/nautilus-installer/src/Makefile
index 59cdc3b43..7ea749c24 100644
--- a/nautilus-installer/src/Makefile
+++ b/nautilus-installer/src/Makefile
@@ -60,9 +60,13 @@ POST_UNINSTALL = :
 host_alias = i686-pc-linux-gnu
 host_triplet = i686-pc-linux-gnu
 AS = @AS@
+BONOBOX_CFLAGS = -I/gnome/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/lib/glib/include -I/usr/X11R6/include -I/gnome/include/gnome-xml
+BONOBOX_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lbonobo -lgdk_pixbuf -ltiff -ljpeg -lpng -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -ldl -lxml -lz -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm -lbonobox
 BONOBO_CFLAGS = -I/gnome/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/lib/glib/include -I/usr/X11R6/include -I/gnome/include/gnome-xml
 BONOBO_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lbonobo -lgdk_pixbuf -ltiff -ljpeg -lpng -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgtk -lgdk -lgmodule -lXext -lX11 -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -ldl -lxml -lz -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm
-CATALOGS =  da.gmo de.gmo fr.gmo gl.gmo ja.gmo ko.gmo no.gmo ru.gmo sv.gmo tr.gmo
+BONOBO_PRINT_CFLAGS = 
+BONOBO_PRINT_LIBS = 
+CATALOGS =  da.gmo de.gmo fr.gmo gl.gmo ja.gmo ko.gmo no.gmo ru.gmo sv.gmo tr.gmo zh_TW.Big5.gmo
 CATOBJEXT = .gmo
 CC = gcc
 CPP = gcc -E
@@ -83,7 +87,7 @@ GHTTP_LIBS = -L/gnome/lib -lghttp
 GLIB_CFLAGS = -I/gnome/lib/glib/include -I/gnome/include
 GLIB_CONFIG = /gnome/bin/glib-config
 GLIB_LIBS = -L/gnome/lib -lglib
-GMOFILES =  da.gmo de.gmo fr.gmo gl.gmo ja.gmo ko.gmo no.gmo ru.gmo sv.gmo tr.gmo
+GMOFILES =  da.gmo de.gmo fr.gmo gl.gmo ja.gmo ko.gmo no.gmo ru.gmo sv.gmo tr.gmo zh_TW.Big5.gmo
 GMSGFMT = /usr/bin/msgfmt
 GNOMECANVASPIXBUF_INCLUDEDIR = 
 GNOMECANVASPIXBUF_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -lgdk_pixbuf -ltiff -ljpeg -lpng -lz -lgtk -lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm -lgnomecanvaspixbuf
@@ -132,7 +136,7 @@ ORBIT_IDL = /gnome/bin/orbit-idl
 ORBIT_LIBS = -L/gnome/lib -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm
 PACKAGE = nautilus
 PAM_LIBS = -ldl -lpam -lpam_misc
-POFILES =  da.po de.po fr.po gl.po ja.po ko.po no.po ru.po sv.po tr.po
+POFILES =  da.po de.po fr.po gl.po ja.po ko.po no.po ru.po sv.po tr.po zh_TW.Big5.po
 POSUB = po
 RANLIB = ranlib
 RPM_LIBS = -lrpm -lz -lbz2 -lpopt -ldb
@@ -165,7 +169,7 @@ nautilus_installer_SOURCES =  	main.c 	support.c support.h 	interface.c interfac
 
 nautilus_installer_LDFLAGS = -static
 
-nautilus_installer_LDADD =          $(top_builddir)/components/services/trilobite/libtrilobite/helixcode-utils.o 			        $(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-distribution.o 		$(top_builddir)/components/services/install/lib/libeazelinstall_minimal.a				$(top_builddir)/components/services/trilobite/libtrilobite/trilobite-root-helper.o			$(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-utils.o			-L/gnome/lib 	-lgnomeui 	-lgnome 	-lart_lgpl 	-lgdk_imlib 	-lgtk 	-lgdk 	-lgmodule 	-lglib 	-L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE 	/usr/lib/libesd.a 	/usr/lib/libaudiofile.a 	-lghttp 	-L/usr/lib -lrpm -lz -ldb1 	-lpopt 	-lxml 
+nautilus_installer_LDADD =          $(top_builddir)/components/services/trilobite/libtrilobite/helixcode-utils.o 			        $(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-distribution.o 		$(top_builddir)/components/services/install/lib/libeazelinstall_minimal.a				$(top_builddir)/components/services/trilobite/libtrilobite/trilobite-root-helper.o			$(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-utils.o			-L/gnome/lib 	-lgnomeui 	-lgnome 	-lart_lgpl 	-lgdk_imlib 	-lgtk 	-lgdk 	-lgmodule 	-lglib 	-L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE 	-lghttp 	-L/usr/lib -lrpm -lz -ldb1 	-lpopt 	-lxml 
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
@@ -183,8 +187,7 @@ $(top_builddir)/components/services/trilobite/libtrilobite/helixcode-utils.o \
 $(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-distribution.o \
 $(top_builddir)/components/services/install/lib/libeazelinstall_minimal.a \
 $(top_builddir)/components/services/trilobite/libtrilobite/trilobite-root-helper.o \
-$(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-utils.o \
-/usr/lib/libesd.a /usr/lib/libaudiofile.a
+$(top_builddir)/components/services/trilobite/libtrilobite/trilobite-core-utils.o
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
@@ -432,6 +435,9 @@ distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
 
+#	/usr/lib/libesd.a \
+#	/usr/lib/libaudiofile.a \
+
 #
 #        /gnome-source/nautilus/components/services/trilobite/libtrilobite/helixcode-utils.o 	\
 #	/gnome-source/nautilus/components/services/install/lib/libinstall.a			\
diff --git a/nautilus-installer/src/Makefile.am b/nautilus-installer/src/Makefile.am
index aec444954..78758bf40 100644
--- a/nautilus-installer/src/Makefile.am
+++ b/nautilus-installer/src/Makefile.am
@@ -46,13 +46,15 @@ nautilus_installer_LDADD = 	\
 	-lgmodule \
 	-lglib \
 	-L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE \
-	/usr/lib/libesd.a \
-	/usr/lib/libaudiofile.a \
 	-lghttp \
 	-L/usr/lib -lrpm -lz -ldb1 \
 	-lpopt \
 	-lxml 
 
+#	/usr/lib/libesd.a \
+#	/usr/lib/libaudiofile.a \
+
+
 #
 #        /gnome-source/nautilus/components/services/trilobite/libtrilobite/helixcode-utils.o 	\
 #	/gnome-source/nautilus/components/services/install/lib/libinstall.a			\
diff --git a/nautilus-installer/src/installer.c b/nautilus-installer/src/installer.c
index b2b6e0694..9aecbc55a 100644
--- a/nautilus-installer/src/installer.c
+++ b/nautilus-installer/src/installer.c
@@ -46,28 +46,38 @@ eazel_install_progress (EazelInstall *service,
 			int total_size_completed, int total_size, 
 			GtkWidget *widget) 
 {
-	GtkProgressBar *progressbar;
+	GtkProgressBar *progressbar, *progress_overall;
 	GtkLabel *action_label;
 	GtkLabel *package_label;
-	float pct;
- 
-	pct = ( (total > 0) ? ((float) ((((float) amount) / total) * 100)): 100.0);
-	fprintf (stdout, "Install Progress - %s - %d %d %% %f\r", pack->name?pack->name:"(null)", amount, total, pct);
 
 	action_label = gtk_object_get_data (GTK_OBJECT (widget), "action_label");
 	package_label = gtk_object_get_data (GTK_OBJECT (widget), "package_label");
-	progressbar = gtk_object_get_data (GTK_OBJECT (widget), "progressbar");
+	progressbar = gtk_object_get_data (GTK_OBJECT (widget), "progressbar_single");
+	progress_overall = gtk_object_get_data (GTK_OBJECT (widget), "progressbar_overall");
+
+	if (amount == 0) {
+		gtk_label_set_text (action_label, "Install :");
+		gtk_label_set_text (package_label, pack->name);
+		gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "%p%% - %v kb/%u kb");
+		gtk_progress_configure (GTK_PROGRESS (progressbar), 0, 0, (float)(total/1024));		
+	}
 
-	gtk_label_set_text (action_label, "Install :");
-	gtk_label_set_text (package_label, pack->name);
-	gtk_progress_bar_update (progressbar, pct/100);
+	if (installer_debug) {
+		float pct;
+		pct = ( (total > 0) ? ((float) ((((float) amount) / total) * 100)): 100.0);
+		fprintf (stdout, "Install Progress - %s - %d %d %% %f\r", 
+			 pack->name?pack->name:"(null)", amount, total, pct);
+	}
+
+	gtk_progress_set_value (GTK_PROGRESS (progressbar), (float)(amount/1024));
+	gtk_progress_set_value (GTK_PROGRESS (progress_overall), (float)package_num-1);
+	g_main_iteration (FALSE);  
 
 	fflush (stdout);
-	if (amount == total) {
+	if (amount == total && installer_debug) {
 		fprintf (stdout, "\n");
 	}
 	
-	gtk_main_iteration ();
 }
 
 
@@ -81,22 +91,36 @@ eazel_download_progress (EazelInstall *service,
 	GtkProgressBar *progressbar;
 	GtkLabel *action_label;
 	GtkLabel *package_label;
-	float pct;
- 
-	pct = ( (total > 0) ? ((float) ((((float) amount) / total) * 100)): 100.0);
-	/* fprintf (stdout, "DOWNLOAD Progress - %s - %d %d %% %f\n", name?name:"(null)", amount, total, pct); */
 
 	action_label = gtk_object_get_data (GTK_OBJECT (widget), "action_label");
 	package_label = gtk_object_get_data (GTK_OBJECT (widget), "package_label");
-	progressbar = gtk_object_get_data (GTK_OBJECT (widget), "progressbar");
+	progressbar = gtk_object_get_data (GTK_OBJECT (widget), "progressbar_single");
 
-	gtk_label_set_text (action_label, "Download :");
-	gtk_label_set_text (package_label, name);
-	gtk_progress_bar_update (progressbar, pct/100);
+	if (amount == 0) {
+		gtk_label_set_text (package_label, name);
+		gtk_label_set_text (action_label, "Download :");
+		gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "%p%% - %v kb/%u kb");
+		gtk_progress_configure (GTK_PROGRESS (progressbar), 0, 0, (float)(total/1024));
+	}
 
-	fflush (stdout);
-	if (amount != total) {
-		gtk_main_iteration ();		
+	if (installer_debug) {
+		float pct;
+		pct = ( (total > 0) ? ((float) ((((float) amount) / total) * 100)): 100.0);
+		fprintf (stdout, "DOWNLOAD Progress - %s - %d %d %% %f\r", 
+			 name?name:"(null)", amount, total, pct); 
+		fflush (stdout);
+	}
+	
+	gtk_progress_set_value (GTK_PROGRESS (progressbar), amount/1024);
+
+	if (amount != total) {		
+		g_main_iteration (FALSE);
+		/* gtk_main_iteration (); */
+	} else if (amount == total) {		
+		/*
+		gtk_progress_set_format_string (GTK_OBJECT (progressbar), "done..."); 
+		g_main_iteration (FALSE);
+		*/
 	}
 }
 
@@ -181,6 +205,80 @@ install_failed (EazelInstall *service,
 }
 
 static void
+download_failed (EazelInstall *service,
+		 const char *name,
+		 char **output)
+{
+	(*output) = g_strdup_printf ("Download of %s failed", name);
+}
+
+static void
+eazel_install_preflight (EazelInstall *service,
+			 int total_size,
+			 int num_packages,
+			 GtkWidget *widget)
+{
+	GtkLabel *action_label;
+	GtkLabel *package_label;
+	GtkProgressBar *progress_overall;
+	char *tmp;
+
+	action_label = gtk_object_get_data (GTK_OBJECT (widget), "action_label");
+	package_label = gtk_object_get_data (GTK_OBJECT (widget), "package_label");
+	progress_overall = gtk_object_get_data (GTK_OBJECT (widget), "progressbar_overall");
+
+	gtk_progress_set_format_string (GTK_PROGRESS (progress_overall), "%p%% - package %v of %u");
+	gtk_progress_configure (GTK_PROGRESS (progress_overall), 0, 0, (float)num_packages);
+	gtk_widget_show (GTK_WIDGET (progress_overall));
+
+	tmp = g_strdup_printf ("Preparing RPM, %d packages (%d mb)", num_packages, total_size/(1024*1024));
+
+	if (installer_debug) {
+		fprintf (stdout, "PREFLIGHT: %s\n", tmp);
+	}
+
+	gtk_label_set_text (action_label, "Install :");
+	gtk_label_set_text (package_label, tmp);
+	g_main_iteration (FALSE);
+	g_main_iteration (FALSE);
+}
+
+static void
+eazel_install_dep_check (EazelInstall *service,
+			 const PackageData *pack,
+			 const PackageData *needs,
+			 GtkWidget *widget)
+{
+	GtkLabel *action_label;
+	GtkLabel *package_label;
+	char *tmp;
+
+	action_label = gtk_object_get_data (GTK_OBJECT (widget), "action_label");
+	package_label = gtk_object_get_data (GTK_OBJECT (widget), "package_label");
+
+	tmp = g_strdup_printf ("%s needs %d", pack->name, needs->name);
+
+	if (installer_debug) {
+		fprintf (stdout, "DEP CHECK : %s\n", tmp);
+	}
+
+	gtk_label_set_text (action_label, "Dep check :");
+	gtk_label_set_text (package_label, tmp);
+
+	g_main_iteration (FALSE);
+}
+
+static gboolean
+eazel_install_delete_files (EazelInstall *service,
+			    GtkWidget *widget) 
+{
+	if (installer_debug) {
+		fprintf (stdout, "Deleting rpm's\n");
+	}
+	return TRUE ;
+}
+
+static void
 make_dirs ()
 {
 	int retval;
@@ -209,6 +307,7 @@ void installer (GtkWidget *window,
 	EazelInstall *service;
 	GtkProgressBar *progressbar;
 	GtkLabel *package_label;
+	GtkLabel *action_label;
 
 	make_dirs ();
 
@@ -216,6 +315,7 @@ void installer (GtkWidget *window,
 		gnome_warning_dialog ("We don't do UPGRADE yet");
 		return;
 	}
+#ifndef NAUTILUS_INSTALLER_RELEASE
 	if (!installer_test) {
 		GnomeDialog *d;
 		d = GNOME_DIALOG (gnome_warning_dialog_parented (_("This is a warning, you're running\n"
@@ -224,17 +324,19 @@ void installer (GtkWidget *window,
 								 GTK_WINDOW (window)));
 		gnome_dialog_run_and_close (d);
 	} 
-
+#endif
+	
+	/* We set force, update and downgrade to true. */
 	service = EAZEL_INSTALL (gtk_object_new (TYPE_EAZEL_INSTALL,
 						 "verbose", TRUE,
 						 "silent", FALSE,
 						 "debug", TRUE,
-						 "test", TRUE, //installer_test () ? FALSE : TRUE,
+						 "test", installer_test ? TRUE : FALSE, 
 						 "force", TRUE,
 						 "depend", FALSE,
 						 "update", TRUE,
 						 "uninstall", method==UNINSTALL ? TRUE : FALSE,
-						 "downgrade", FALSE,
+						 "downgrade", TRUE,
 						 "protocol", PROTOCOL,
 						 "tmp_dir", TMP_DIR,
 						 "rpmrc_file", RPMRC,
@@ -258,10 +360,20 @@ void installer (GtkWidget *window,
 
 	g_assert (service != NULL);
 
-	gtk_signal_connect (GTK_OBJECT (service), "download_progress", eazel_download_progress, window);
-	gtk_signal_connect (GTK_OBJECT (service), "install_progress", eazel_install_progress, window);
-	/* gtk_signal_connect (GTK_OBJECT (service), "download_failed", download_failed, window); */
-	gtk_signal_connect (GTK_OBJECT (service), "install_failed", install_failed, &failure_info);
+	gtk_signal_connect (GTK_OBJECT (service), "download_progress", 
+			    GTK_SIGNAL_FUNC (eazel_download_progress), window);
+	gtk_signal_connect (GTK_OBJECT (service), "install_progress", 
+			    GTK_SIGNAL_FUNC (eazel_install_progress), window);
+	gtk_signal_connect (GTK_OBJECT (service), "preflight_check", 
+			    GTK_SIGNAL_FUNC (eazel_install_preflight), window);
+	gtk_signal_connect (GTK_OBJECT (service), "dependency_check", 
+			    GTK_SIGNAL_FUNC (eazel_install_dep_check), window);
+	gtk_signal_connect (GTK_OBJECT (service), "delete_files", 
+			    GTK_SIGNAL_FUNC (eazel_install_delete_files), window);
+	gtk_signal_connect (GTK_OBJECT (service), "download_failed", 
+			    GTK_SIGNAL_FUNC (download_failed), &failure_info); 
+	gtk_signal_connect (GTK_OBJECT (service), "install_failed", 
+			    GTK_SIGNAL_FUNC (install_failed), &failure_info);
 
 	failure_info = g_new0 (char, 8192);
 
@@ -276,16 +388,23 @@ void installer (GtkWidget *window,
 		eazel_install_uninstall_packages (service, NULL);
 		break;
 	};
+
 	eazel_install_destroy (GTK_OBJECT (service));
 
 	package_label = gtk_object_get_data (GTK_OBJECT (window), "package_label");
-	progressbar = gtk_object_get_data (GTK_OBJECT (window), "progressbar");
-
-	gtk_label_set_text (package_label, "Completed :");
-	gtk_progress_bar_update (progressbar, 1);
+	progressbar = gtk_object_get_data (GTK_OBJECT (window), "progressbar_single");
+	gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "done");
+	progressbar = gtk_object_get_data (GTK_OBJECT (window), "progressbar_overall");
+	gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "done");
 
 	if (strlen (failure_info)>1) {
+		gtk_label_set_text (package_label, "Failed");	
+		if (installer_debug) {
+			fprintf (stdout, "ERROR :\n%s", failure_info);
+		}
 		gnome_error_dialog_parented (failure_info, GTK_WINDOW (window));
+	} else {
+		gtk_label_set_text (package_label, "Completed");	
 	}
 }
 
diff --git a/nautilus-installer/src/interface.c b/nautilus-installer/src/interface.c
index 8070ecbf8..2d13c6bc0 100644
--- a/nautilus-installer/src/interface.c
+++ b/nautilus-installer/src/interface.c
@@ -51,7 +51,8 @@ create_window (void)
   GtkWidget *table2;
   GtkWidget *label12;
   GtkWidget *action_label;
-  GtkWidget *progressbar;
+  GtkWidget *progressbar1;
+  GtkWidget *progressbar2;
   GtkWidget *package_label;
   GtkWidget *fixed1;
   GtkWidget *begin_button;
@@ -233,14 +234,14 @@ create_window (void)
   gtk_widget_show (label11);
   gtk_box_pack_start (GTK_BOX (vbox5), label11, TRUE, FALSE, 0);
 
-  table2 = gtk_table_new (2, 2, FALSE);
+  table2 = gtk_table_new (3, 2, FALSE);
   set_white_stuff (GTK_WIDGET (table2));
   gtk_widget_set_name (table2, "table2");
   gtk_widget_ref (table2);
   gtk_object_set_data_full (GTK_OBJECT (window), "table2", table2,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (table2);
-  gtk_box_pack_start (GTK_BOX (vbox5), table2, FALSE, FALSE, 16);
+  gtk_box_pack_start (GTK_BOX (vbox5), table2, FALSE, TRUE, 16);
   gtk_table_set_row_spacings (GTK_TABLE (table2), 16);
 
   label12 = gtk_label_new (_("Package :"));
@@ -250,8 +251,9 @@ create_window (void)
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (label12);
   gtk_table_attach (GTK_TABLE (table2), label12, 0, 1, 0, 1,
-                    (GtkAttachOptions) (0),
-                    (GtkAttachOptions) (0), 0, 0);
+                    (GtkAttachOptions) 0, 
+                    (GtkAttachOptions) 0,
+		    0, 0);
 
   action_label = gtk_label_new (_(""));
   gtk_widget_set_name (action_label, "");
@@ -263,15 +265,27 @@ create_window (void)
                     (GtkAttachOptions) (0),
                     (GtkAttachOptions) (0), 0, 0);
 
-  progressbar = gtk_progress_bar_new ();
-  gtk_widget_set_name (progressbar, "progressbar");
-  gtk_widget_ref (progressbar);
-  gtk_object_set_data_full (GTK_OBJECT (window), "progressbar", progressbar,
+  progressbar1 = gtk_progress_bar_new ();
+  gtk_widget_set_name (progressbar1, "progressbar_single");
+  gtk_widget_ref (progressbar1);
+  gtk_object_set_data_full (GTK_OBJECT (window), "progressbar_single", progressbar1,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_progress_set_show_text (GTK_PROGRESS (progressbar1), TRUE);		  
+  gtk_widget_show (progressbar1);
+  gtk_table_attach (GTK_TABLE (table2), progressbar1, 1, 2, 1, 2,
+		    GTK_EXPAND,
+                    GTK_EXPAND,
+		    0, 0);
+
+  progressbar2 = gtk_progress_bar_new ();
+  gtk_widget_set_name (progressbar2, "progressbar_overall");
+  gtk_widget_ref (progressbar2);
+  gtk_object_set_data_full (GTK_OBJECT (window), "progressbar_overall", progressbar2,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (progressbar);
-  gtk_table_attach (GTK_TABLE (table2), progressbar, 1, 2, 1, 2,
-                    GTK_FILL,
-                    GTK_FILL,
+  gtk_progress_set_show_text (GTK_PROGRESS (progressbar2), TRUE);		  
+  gtk_table_attach (GTK_TABLE (table2), progressbar2, 1, 2, 2, 3,
+		    GTK_EXPAND,
+                    GTK_EXPAND,
 		    0, 0);
 
   package_label = gtk_label_new (_(""));
diff --git a/nautilus-installer/src/link.sh b/nautilus-installer/src/link.sh
index 68ad9ae2b..749c3d9cb 100755
--- a/nautilus-installer/src/link.sh
+++ b/nautilus-installer/src/link.sh
@@ -7,19 +7,18 @@ make -f makefile.staticlib
 popd
 
 make clean
-make CFLAGS="-O -Werror" LDFLAGS="-static"
+make CFLAGS="-O -Werror $*" LDFLAGS="-static"
 gcc -static -O -Werror -o nautilus-installer main.o support.o interface.o callbacks.o installer.o \
 ../../components/services/install/lib/libeazelinstall_minimal.a \
 ../../components/services/trilobite/libtrilobite/helixcode-utils.o \
 ../../components/services/trilobite/libtrilobite/trilobite-core-distribution.o \
-../../components/services/trilobite/libtrilobite/trilobite-root-helper.o \
 ../../components/services/trilobite/libtrilobite/trilobite-core-utils.o \
 -L/gnome/lib -lgnomeui -lgnome -lart_lgpl -lgdk_imlib -lgtk -lgdk -lgmodule -lglib \
 -L/usr/X11R6/lib -ldl -lXext -lX11 -lm -lSM -lICE /usr/lib/libesd.a /usr/lib/libaudiofile.a -lghttp \
 -L/usr/lib -lrpm -lbz2 -lz -ldb1 -lpopt -lxml 
 
-echo Stripping...
-strip nautilus-installer
+#echo Stripping...
+#strip nautilus-installer
 echo Packing...
 gzexe nautilus-installer
 
diff --git a/nautilus-installer/src/prescript b/nautilus-installer/src/prescript
index 5dbf10ed0..16f1fcf49 100644
--- a/nautilus-installer/src/prescript
+++ b/nautilus-installer/src/prescript
@@ -1,12 +1,14 @@
 if test x$DISPLAY = x; then
     echo "The Nautilus-Installer requires X"
 fi
-if ! test -d /var/eazel/services; then
+if test $UID -ne 0; then
     echo ""
-    echo "Nautilus-Installer v 0.1d"
+    echo "Nautilus-Installer v 0.2"
     echo ""
     echo "argle bargle glob glyf muhainapuniua bork bork bork"
     echo "fisk er dumme og heste er grimme"
+    echo "To maend, gik ud i en skov, tog bukserne af, til de begge"
+    echo "blev flove. Gravballemanden blev min skaebne"
     echo ""
     echo "The Nautilus-Installer requires superuser access to prepare the system"
     echo "It needs to create a few administrative directories on in /var and"
@@ -14,8 +16,12 @@ if ! test -d /var/eazel/services; then
     echo "we would never hurt a fly arglebargle."
     echo ""
     echo "Please enter root password at the prompt"
-    su - -c "mkdir /var/eazel && mkdir /var/eazel/services"
-    echo Uncompressing...
-    sh $0 $* $USER
+    xhost + localhost
+    su - -c "export DISPLAY=$DISPLAY && cd $PWD && echo Uncompressing... && sh $0 $* $USER"
+    xhost - localhost
     exit
 fi
+if ! test -d /var/eazel/services; then
+    mkdir /var/eazel 
+    mkdir /var/eazel/services
+fi