Commit ca859620 authored by Eskil Heyn Olsen's avatar Eskil Heyn Olsen
Browse files

Fixed 5169 and 5170 (install and verify didn't work).

	* components/rpmview/nautilus-rpm-verify-window.c:
	(nautilus_rpm_verify_window_set_progress):
	* components/rpmview/nautilus-rpm-view-private.h:
	* components/rpmview/nautilus-rpm-view.c:
	(nautilus_rpm_view_initialize), (verify_failed_signal),
	(nautilus_rpm_view_verify_files):
	Fixed 5169 and 5170 (install and verify didn't work).
parent 80f47351
2000-12-14 Eskil Heyn Olsen <eskil@eazel.com>
* components/rpmview/nautilus-rpm-verify-window.c:
(nautilus_rpm_verify_window_set_progress):
* components/rpmview/nautilus-rpm-view-private.h:
* components/rpmview/nautilus-rpm-view.c:
(nautilus_rpm_view_initialize), (verify_failed_signal),
(nautilus_rpm_view_verify_files):
Fixed 5169 and 5170 (install and verify didn't work).
2000-12-14 Andy Hertzfeld <andy@eazel.com>
* src/nautilus-sidebar.c: (nautilus_sidebar_initialize_class),
......@@ -24,7 +34,7 @@
(eazel_install_initialize), (eazel_install_set_debug):
Set debug in packagesystem to FAIL, not VERBOSE. _set_debug raises
it to verbose.
2000-12-14 Maciej Stachowiak <mjs@eazel.com>
reviewed by: Pavel Cisler <pavel@eazel.com>
......
......@@ -229,6 +229,7 @@ nautilus_rpm_verify_window_set_progress (NautilusRPMVerifyWindow *window,
window->details->current_file = g_strdup (file);
window->details->amount = amount;
window->details->total = total;
nautilus_rpm_verify_window_update_message (window);
}
void
......
......@@ -73,6 +73,8 @@ struct NautilusRPMViewDetails {
int last_file_index;
int selected_file;
gboolean verify_success;
#ifdef EAZEL_SERVICES
/* for installing an rpm */
EazelInstallCallback *installer;
......
......@@ -128,7 +128,7 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
rpm_view->details = g_new0 (NautilusRPMViewDetails, 1);
rpm_view->details->package_system = eazel_package_system_new (NULL);
eazel_package_system_set_debug (rpm_view->details->package_system, EAZEL_PACKAGE_SYSTEM_DEBUG_VERBOSE);
eazel_package_system_set_debug (rpm_view->details->package_system, EAZEL_PACKAGE_SYSTEM_DEBUG_FAIL);
rpm_view->details->package = NULL;
rpm_view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (rpm_view));
......@@ -602,12 +602,10 @@ static gboolean
verify_failed_signal (EazelPackageSystem *system,
EazelPackageSystemOperation op,
const PackageData *package,
GtkWidget *verify_window)
NautilusRPMView *rpm_view)
{
g_assert (verify_window);
g_assert (NAUTILUS_RPM_VERIFY_WINDOW (verify_window));
nautilus_rpm_verify_window_set_error_mode (NAUTILUS_RPM_VERIFY_WINDOW (verify_window), TRUE);
nautilus_rpm_verify_window_set_error_mode (NAUTILUS_RPM_VERIFY_WINDOW (rpm_view->details->verify_window), TRUE);
rpm_view->details->verify_success = FALSE;
return FALSE;
}
......@@ -652,12 +650,13 @@ nautilus_rpm_view_verify_files (GtkWidget *widget,
failsignal = gtk_signal_connect (GTK_OBJECT (rpm_view->details->package_system),
"failed",
(GtkSignalFunc)verify_failed_signal,
rpm_view->details->verify_window);
rpm_view);
progresssignal = gtk_signal_connect (GTK_OBJECT (rpm_view->details->package_system),
"progress",
(GtkSignalFunc)verify_progress_signal,
rpm_view->details->verify_window);
rpm_view->details->verify_success = TRUE;
eazel_package_system_verify (rpm_view->details->package_system,
NULL,
packages);
......@@ -666,10 +665,11 @@ nautilus_rpm_view_verify_files (GtkWidget *widget,
gtk_signal_disconnect (GTK_OBJECT (rpm_view->details->package_system), progresssignal);
g_list_free (packages);
/*
nautilus_rpm_verify_window_set_error_mode (NAUTILUS_RPM_VERIFY_WINDOW (rpm_view->details->verify_window), FALSE);
nautilus_rpm_verify_window_set_message (NAUTILUS_RPM_VERIFY_WINDOW (rpm_view->details->verify_window), _("Verification completed."));
*/
if (rpm_view->details->verify_success) {
nautilus_rpm_verify_window_set_error_mode (NAUTILUS_RPM_VERIFY_WINDOW (rpm_view->details->verify_window), FALSE);
nautilus_rpm_verify_window_set_message (NAUTILUS_RPM_VERIFY_WINDOW (rpm_view->details->verify_window), _("Verification completed, package ok."));
} else {
}
}
/* callback to handle the verify command */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment