[gthumb] Just use a simple while loop to do the same thing
- From: Michael J. Chudobiak <mjc src gnome org>
- To: svn-commits-list gnome org
- Subject: [gthumb] Just use a simple while loop to do the same thing
- Date: Fri, 8 May 2009 12:24:27 -0400 (EDT)
commit 606001e3ad38ae3e1b99231cdf9b52b3319f95c0
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date: Fri May 8 12:23:31 2009 -0400
Just use a simple while loop to do the same thing
---
src/dlg-reset-exif.c | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/src/dlg-reset-exif.c b/src/dlg-reset-exif.c
index e3fd5f3..1c6f72e 100644
--- a/src/dlg-reset-exif.c
+++ b/src/dlg-reset-exif.c
@@ -94,36 +94,12 @@ typedef struct {
} BatchTransformation;
-static void apply_transformation_to_all__apply_to_current (BatchTransformation *);
-
-
static void
-apply_transformation_to_all_continue (gpointer data)
+apply_transformation (BatchTransformation *bt_data)
{
- BatchTransformation *bt_data = data;
-
- if ((bt_data->cancel == TRUE) || (bt_data->scan == NULL)) {
- if (GTK_IS_WIDGET (bt_data->dialog))
- gtk_widget_destroy (bt_data->dialog);
- g_object_unref (bt_data->gui);
-
- if (bt_data->data->dialog == NULL)
- dialog_data_free (bt_data->data);
- else
- gtk_widget_destroy (bt_data->data->dialog);
- g_free (bt_data);
- }
- else
- apply_transformation_to_all__apply_to_current (bt_data);
-}
-
-
-static void
-apply_transformation_to_all__apply_to_current (BatchTransformation *bt_data)
-{
- FileData *file = bt_data->scan->data;
+ while (bt_data->scan && (bt_data->cancel == FALSE)) {
+ FileData *file = bt_data->scan->data;
- if (bt_data->cancel == FALSE) {
gtk_label_set_text (GTK_LABEL (bt_data->label), file->utf8_name);
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bt_data->bar),
@@ -137,9 +113,19 @@ apply_transformation_to_all__apply_to_current (BatchTransformation *bt_data)
bt_data->i++;
bt_data->scan = bt_data->scan->next;
-
- apply_transformation_to_all_continue (bt_data);
}
+
+ if (GTK_IS_WIDGET (bt_data->dialog))
+ gtk_widget_destroy (bt_data->dialog);
+
+ g_object_unref (bt_data->gui);
+
+ if (bt_data->data->dialog == NULL)
+ dialog_data_free (bt_data->data);
+ else
+ gtk_widget_destroy (bt_data->data->dialog);
+
+ g_free (bt_data);
}
@@ -193,7 +179,7 @@ apply_transformation_to_all (DialogData *data)
bt_data->n = g_list_length (data->current_image);
bt_data->i = 0;
bt_data->scan = data->current_image;
- apply_transformation_to_all__apply_to_current (bt_data);
+ apply_transformation (bt_data);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]