summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Neumair <chris@gnome-de.org>2006-04-08 11:48:01 +0000
committerChristian Neumair <cneumair@src.gnome.org>2006-04-08 11:48:01 +0000
commitdd8609e2b7987e83f6c8f7680b0c2d9d0359cf9d (patch)
tree381db79dd40ff7ad37e937e301728c6d381e2e68
parent72a15dafc31018e570bcf174389cbcc5ce244d06 (diff)
downloadnautilus-dd8609e2b7987e83f6c8f7680b0c2d9d0359cf9d.tar.gz
Update progress dialog when setting its operation string, also set
2006-04-08 Christian Neumair <chris@gnome-de.org> * libnautilus-private/nautilus-file-operations-progress.c: (nautilus_file_operations_progress_update), (nautilus_file_operations_progress_set_operation_string): Update progress dialog when setting its operation string, also set operation string during preflight.
-rw-r--r--ChangeLog8
-rw-r--r--libnautilus-private/nautilus-file-operations-progress.c7
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cf7f3da06..81680df59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-08 Christian Neumair <chris@gnome-de.org>
+
+ * libnautilus-private/nautilus-file-operations-progress.c:
+ (nautilus_file_operations_progress_update),
+ (nautilus_file_operations_progress_set_operation_string):
+ Update progress dialog when setting its operation string,
+ also set operation string during preflight.
+
2006-04-08 Martin Wehner <martin.wehner@gmail.com>
* src/file-manager/fm-directory-view.c:
diff --git a/libnautilus-private/nautilus-file-operations-progress.c b/libnautilus-private/nautilus-file-operations-progress.c
index 675a5576f..1ea4de829 100644
--- a/libnautilus-private/nautilus-file-operations-progress.c
+++ b/libnautilus-private/nautilus-file-operations-progress.c
@@ -151,9 +151,8 @@ nautilus_file_operations_progress_update (NautilusFileOperationsProgress *progre
char *remaining_time_string = NULL;
if (progress->details->bytes_total == 0) {
- /* We haven't set up the file count yet, do not update
- * the progress bar until we do.
- */
+ /* We haven't set up the file count yet */
+ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progress->details->progress_bar), progress->details->progress_title);
return;
}
@@ -550,6 +549,8 @@ nautilus_file_operations_progress_set_operation_string (NautilusFileOperationsPr
g_free (progress->details->progress_title);
progress->details->progress_title = g_strdup (operation_string);
+
+ nautilus_file_operations_progress_update (progress);
}
void