gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix small bug in eazel-install (don't set the downloaded flag if the rpm didn't get downloaded); correct FIXME comment; clean up install main to have the right log domain and remove unused code

Browse source
This commit is contained in:
Robey Pointer 2000-09-06 00:45:02 +00:00
parent 3931344eed
commit 2e015a5e8c
6 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2000-09-05 Robey Pointer <robey@eazel.com>
* components/services/install/lib/eazel-install-protocols.c:
(eazel_install_fetch_package):
* components/services/install/lib/eazel-install-rpm-glue.c:
(eazel_install_download_packages):
* components/services/install/nautilus-view/nautilus-service-instal
l-view.c: (nautilus_service_install_downloading):
* components/services/install/server/main.c:
(trilobite_service_factory_destroy), (main):
Fix small bug in eazel-install (don't set the downloaded flag if
the rpm didn't get downloaded); correct FIXME comment; clean up
install main to have the right log domain and remove unused code.
2000-09-05 Michael Engber <engber@eazel.com>
We now update the gnome_config settings that store the list

3
components/services/install-view/nautilus-service-install-view.c
View file

@ -510,8 +510,7 @@ nautilus_service_install_downloading (EazelInstallCallback *cb, const char *name
char *out;
const char *root_name, *tmp;
/* the "name" is annoyingly the entire path */
/* FIXME bugzilla.eazel.com 2586: this will change. */
/* sometimes the "name" is annoyingly the entire path */
root_name = name;
while ((tmp = strchr (root_name, '/')) != NULL) {
root_name = tmp+1;

2
components/services/install/lib/eazel-install-protocols.c
View file

@ -529,7 +529,7 @@ eazel_install_fetch_package (EazelInstall *service,
/*
FIXME bugzilla.eazel.com 2241: until we get the md5 set in the xml parse, don't md5 check it
if (strncmp (package->md5, md5, 16)!=0) {
if (memcmp (package->md5, md5, 16)!=0) {
g_warning (_("MD5 mismatch, package may be compromised"));
packagedata_destroy (package);
result = FALSE;

2
components/services/install/lib/eazel-install-rpm-glue.c
View file

@ -252,7 +252,7 @@ eazel_install_download_packages (EazelInstall *service,
(*failed_packages) = remove_list;
}
return TRUE;
return result;
}
/* Checks for pre-existance of all the packages

3
components/services/install/nautilus-view/nautilus-service-install-view.c
View file

@ -510,8 +510,7 @@ nautilus_service_install_downloading (EazelInstallCallback *cb, const char *name
char *out;
const char *root_name, *tmp;
/* the "name" is annoyingly the entire path */
/* FIXME bugzilla.eazel.com 2586: this will change. */
/* sometimes the "name" is annoyingly the entire path */
root_name = name;
while ((tmp = strchr (root_name, '/')) != NULL) {
root_name = tmp+1;

26
components/services/install/server/main.c
View file

@ -62,12 +62,12 @@ trilobite_service_factory_destroy (GtkObject *object)
{
trilobites_active--;
g_message ("eazel_install trilobites active = %d", trilobites_active);
trilobite_debug ("destroy, eazel_install trilobites active = %d", trilobites_active);
if (trilobites_active != 0) {
return;
}
g_message ("Destroying factory object");
trilobite_debug ("Destroying factory object");
bonobo_object_unref (BONOBO_OBJECT (factory));
gtk_main_quit ();
@ -130,31 +130,13 @@ int main(int argc, char *argv[]) {
g_datalist_init (&data);
g_datalist_set_data (&data, "debug", (void *)1);
if (trilobite_init ("trilobite-sample-service", "0.1", "/tmp/trilobite-install.log", argc, argv, data) == FALSE) {
if (trilobite_init ("trilobite-eazel-install-service", "0.1", "/tmp/trilobite-install.log",
argc, argv, data) == FALSE) {
g_error ("Could not initialize trilobite. :(");
exit (1);
}
g_datalist_clear (&data);
#if 0 /* hopefully obsoleted by trilobite_init */
#define TEST_NEW_PASSWORD_STUFF
#ifdef TEST_NEW_PASSWORD_STUFF
gnome_init_with_popt_table ("trilobite-sample-service", "0.1", argc, argv, oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
#else
gtk_type_init ();
gnomelib_init ("trilobite-eazel-install-service-factory", "0.1");
gnomelib_register_popt_table (oaf_popt_options, "Trilobite-Eazel-Install-Server");
orb = oaf_init (argc, argv);
gnomelib_parse_args (argc, argv, 0);
#endif
if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
g_error ("Could not initialize Bonobo");
}
#endif /* 0 */
gnome_vfs_init ();
factory = bonobo_generic_factory_new_multi (OAF_ID_FACTORY,