text file on how the rpmsearch.cgi should work.

	* components/services/docs/installer-rpmsearch:
	text file on how the rpmsearch.cgi should work.

	*
	components/services/install/command-line/eazel-alt-install-corba.c:
	(set_parameters_from_command_line),
	(eazel_download_progress_signal), (eazel_install_progress_signal),
	(install_failed), (create_package), (done):
	Added --force to do force installs. Also fixed the screen output
	to show the begin/progress/end handling on download and install
	callbacks.
	Changed the output tree in case of install_failed.

	* components/services/install/command-line/eazel-alt-install.c:
	(set_parameters_from_command_line),
	(eazel_install_progress_signal), (eazel_download_progress_signal),
	(main):
	Tried to revive it...

	* components/services/install/lib/eazel-install-corba-callback.c:
	(eazel_install_callback_class_initialize):
	Removed the evil marshal func, and renamed it to prevent name clashes.

	* components/services/install/lib/eazel-install-object.c:
	(eazel_install_destroy), (eazel_install_class_initialize),
	(eazel_install_initialize):
	Some more free's in the _destroy.

	* components/services/install/lib/eazel-install-private.h:
	Added a hash table to fix bug #1585.

	* components/services/install/lib/eazel-install-protocols.c:
	(http_fetch_remote_file), (eazel_install_fetch_package):
	Fixed bug 1620. Would probably be more elegant to use some
	enums. Also now inserts packages into the hashtable in
	EazelInstall.

	* components/services/install/lib/eazel-install-public.h:
	* components/services/install/lib/eazel-install-rpm-glue.c:
	(rpm_show_progress), (do_rpm_install), (do_rpm_uninstall),
	Fixed bug 1585 by having the rpm_show_progress lookup the package
	in the hashtable, and bug 1620 by inserting a load of if's to make
	sure the signal emits with amount==0, amount > 0 && < total and
	amount == total.
	(eazel_install_fetch_rpm_dependencies):
	Fixed bug 1363.

	* components/services/install/lib/eazel-install-types.c:
	(rpmfilename_from_packagedata), (packagedata_hash_equal),
	(packagedata_status_str_to_enum),
	(eazel_install_gtk_marshal_NONE__POINTER_INT_INT_INT_INT_INT_INT):
	* components/services/install/lib/eazel-install-types.h:
	Added the evil marshaller to types.c

	* nautilus-installer/src/Makefile:
	* nautilus-installer/src/installer.c: (eazel_install_progress),
	(eazel_download_progress):
	* nautilus-installer/src/interface.c: (create_window):
	Tried to make the installer look slightly more pleasing.

3 files changed, 13 insertions, 11 deletions

diff --git a/nautilus-installer/src/Makefile b/nautilus-installer/src/Makefile
index 0ea90efd5..293dd421e 100644
--- a/nautilus-installer/src/Makefile
+++ b/nautilus-installer/src/Makefile
@@ -72,7 +72,7 @@ DLLTOOL = @DLLTOOL@
 EAZEL_SERVICES = 1
 GCONF_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include -I/usr/X11R6/include
 GCONF_CONFIG = /gnome/bin/gconf-config
-GCONF_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -lgconf -lgconf-gtk -lgtk -lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm
+GCONF_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -lgconf-gtk -lgconf -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgtk -lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm
 GDK_PIXBUF_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include -I/gnome/include -I/usr/X11R6/include
 GDK_PIXBUF_CONFIG = /gnome/bin/gdk-pixbuf-config
 GDK_PIXBUF_LIBS = -L/gnome/lib -lgdk_pixbuf -L/gnome/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXext -lX11 -lm
@@ -95,7 +95,7 @@ GNOME_LIBS = -L/gnome/lib -L/usr/lib -lgnome -lgnomesupport -lesd -laudiofile -l
 GNORBA_CFLAGS = 
 GNORBA_LIBS = 
 GTKHTML_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include -I/usr/X11R6/include -DNEED_GNOMESUPPORT_H -I/gnome/lib/gnome-libs/include -I/gnome/include/gnome-xml -DGTKHTML_HAVE_GCONF
-GTKHTML_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgtkhtml -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -lgdk_pixbuf -ltiff -ljpeg -lpng -lxml -lz -lgconf -lgconf-gtk -lgtk -lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm
+GTKHTML_LIBS = -rdynamic -L/gnome/lib -L/usr/X11R6/lib -L/usr/lib -lgtkhtml -lgnomeprint -lgnomeui -lart_lgpl -lgdk_imlib -lSM -lICE -lgnome -lgnomesupport -lesd -laudiofile -ldb1 -lgdk_pixbuf -ltiff -ljpeg -lpng -lxml -lz -lgconf-gtk -lgconf -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lnsl -lgtk -lgdk -lgmodule -lglib -ldl -lXext -lX11 -lm
 GTK_CFLAGS = 
 GTK_LIBS = 
 GT_NO = 
@@ -120,9 +120,9 @@ MOZILLA_COMPONENT_CFLAGS = -I/usr/include/mozilla
 MOZILLA_COMPONENT_LDFLAGS = -L/usr/lib/mozilla
 MOZILLA_COMPONENT_LIBS = -lgtkembedmoz 				-lgtksuperwin 				-lxpcom 				-lnspr4 				-lplc4 				-lplds4
 NM = /usr/bin/nm -B
-OAF_CFLAGS = 
+OAF_CFLAGS = -I/gnome/include -I/gnome/lib/glib/include
 OAF_CONFIG = /gnome/bin/oaf-config
-OAF_LIBS = 
+OAF_LIBS = -L/gnome/lib -loaf -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib -lnsl -lm
 OBJDUMP = @OBJDUMP@
 ORBIT_CFLAGS = -I/gnome/lib/glib/include -I/gnome/include
 ORBIT_CONFIG = /gnome/bin/orbit-config
diff --git a/nautilus-installer/src/installer.c b/nautilus-installer/src/installer.c
index 8daba3d87..4bd5d98ca 100644
--- a/nautilus-installer/src/installer.c
+++ b/nautilus-installer/src/installer.c
@@ -38,8 +38,9 @@ char *failure_info;
 static void 
 eazel_install_progress (EazelInstall *service, 
 			const PackageData *pack,
-			int amount, 
-			int total,
+			int package_num, int num_packages, 
+			int amount, int total,
+			int total_size_completed, int total_size, 
 			GtkWidget *widget) 
 {
 	GtkProgressBar *progressbar;
@@ -55,7 +56,7 @@ eazel_install_progress (EazelInstall *service,
 	progressbar = gtk_object_get_data (GTK_OBJECT (widget), "progressbar");
 
 	gtk_label_set_text (action_label, "Install :");
-	gtk_label_set_text (package_label, pack->name + strlen (TMP_DIR) + 1);
+	gtk_label_set_text (package_label, pack->name);
 	gtk_progress_bar_update (progressbar, pct/100);
 
 	fflush (stdout);
@@ -87,7 +88,7 @@ eazel_download_progress (EazelInstall *service,
 	progressbar = gtk_object_get_data (GTK_OBJECT (widget), "progressbar");
 
 	gtk_label_set_text (action_label, "Download :");
-	gtk_label_set_text (package_label, name + strlen (TMP_DIR) + 1);
+	gtk_label_set_text (package_label, name);
 	gtk_progress_bar_update (progressbar, pct/100);
 
 	fflush (stdout);
diff --git a/nautilus-installer/src/interface.c b/nautilus-installer/src/interface.c
index 9c6f7b548..8070ecbf8 100644
--- a/nautilus-installer/src/interface.c
+++ b/nautilus-installer/src/interface.c
@@ -254,7 +254,7 @@ create_window (void)
                     (GtkAttachOptions) (0), 0, 0);
 
   action_label = gtk_label_new (_(""));
-  gtk_widget_set_name (action_label, "action_label");
+  gtk_widget_set_name (action_label, "");
   gtk_widget_ref (action_label);
   gtk_object_set_data_full (GTK_OBJECT (window), "action_label", action_label,
                             (GtkDestroyNotify) gtk_widget_unref);
@@ -270,8 +270,9 @@ create_window (void)
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (progressbar);
   gtk_table_attach (GTK_TABLE (table2), progressbar, 1, 2, 1, 2,
-                    (GtkAttachOptions) (0),
-                    (GtkAttachOptions) (0), 0, 0);
+                    GTK_FILL,
+                    GTK_FILL,
+		    0, 0);
 
   package_label = gtk_label_new (_(""));
   gtk_widget_set_name (package_label, "package_label");