[file-roller: 115/123] emit LISTING_CONTENT before loading the archive list

[Paolo Bacchilega <paobac src gnome org>]

commit 719f8aea0f7fa0bd9cfa995b174497756accc727
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Mon Aug 6 13:04:07 2012 +0200

    emit LISTING_CONTENT before loading the archive list

 src/fr-window.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/fr-window.c b/src/fr-window.c
index 305356e..e4a784c 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -6161,6 +6161,7 @@ archive_load_ready_cb (GObject      *source_object,
 static void
 fr_window_archive_load (FrWindow *window)
 {
+	_archive_operation_started (window, FR_ACTION_LISTING_CONTENT);
 	fr_archive_list (window->archive,
 			 window->priv->password,
 			 window->priv->cancellable,
@@ -6185,9 +6186,9 @@ archive_open_ready_cb (GObject      *source_object,
 		       0,
 		       archive != NULL);
 
-	if (archive == NULL) {
-		_archive_operation_completed (window, FR_ACTION_LOADING_ARCHIVE, error);
-		g_error_free (error);
+	_archive_operation_completed (window, FR_ACTION_LOADING_ARCHIVE, error);
+	if ((archive == NULL) || (error != NULL)) {
+		_g_error_free (error);
 		return;
 	}