From 41b1173190f702693b0b4fd2654cf2dc28a447f4 Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Fri, 3 Oct 2014 14:05:39 +0000 Subject: Imported Upstream version 0.995 --- src/xsane-multipage-project.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/xsane-multipage-project.c') diff --git a/src/xsane-multipage-project.c b/src/xsane-multipage-project.c index 7d6a565..99b0106 100644 --- a/src/xsane-multipage-project.c +++ b/src/xsane-multipage-project.c @@ -454,7 +454,7 @@ static void xsane_multipage_project_load() } gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status)); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); } /* ---------------------------------------------------------------------------------------------------------------------- */ @@ -525,13 +525,13 @@ void xsane_multipage_project_save() snprintf(buf, 32, "%s@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", xsane.multipage_status); /* fill 32 characters status line */ fprintf(projectfile, "%s\n", buf); /* first line is status of multipage */ gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status)); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); } else { fprintf(projectfile, " \n"); /* no multipage status */ gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), ""); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); } if (xsane.multipage_filename) @@ -834,7 +834,7 @@ static void xsane_multipage_edit_callback(GtkWidget *widget, gpointer list) xsane_multipage_project_save(); gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status)); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); xsane_viewer_new(outfilename, NULL, FALSE, filename, VIEWER_NO_NAME_MODIFICATION, IMAGE_SAVED); } @@ -882,7 +882,7 @@ static void xsane_multipage_save_file() xsane.multipage_status = strdup(TEXT_PROJECT_STATUS_FILE_SAVING); gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status)); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); snprintf(multipage_filename, sizeof(multipage_filename), "%s%s", preferences.multipage_project, preferences.multipage_filetype); @@ -926,7 +926,7 @@ static void xsane_multipage_save_file() xsane.multipage_status = strdup(TEXT_PROJECT_STATUS_FILE_SAVING_ABORTED); gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status)); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); return; } } @@ -962,7 +962,7 @@ static void xsane_multipage_save_file() xsane.multipage_status = strdup(TEXT_PROJECT_STATUS_FILE_SAVING_ERROR); gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status)); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); return; } @@ -993,7 +993,7 @@ static void xsane_multipage_save_file() xsane.multipage_status = strdup(TEXT_PROJECT_STATUS_FILE_SAVING_ERROR); gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status)); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); return; } } @@ -1012,7 +1012,7 @@ static void xsane_multipage_save_file() xsane.multipage_status = strdup(TEXT_PROJECT_STATUS_FILE_SAVING_ERROR); gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status)); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); return; } @@ -1049,7 +1049,7 @@ static void xsane_multipage_save_file() snprintf(buf, sizeof(buf), "%s", PROGRESS_PACKING_DATA); gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), buf); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); while (gtk_events_pending()) { @@ -1195,7 +1195,7 @@ static void xsane_multipage_save_file() xsane_multipage_project_save(); gtk_progress_set_format_string(GTK_PROGRESS(xsane.project_progress_bar), _(xsane.multipage_status)); - gtk_progress_bar_update(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); + xsane_progress_bar_set_fraction(GTK_PROGRESS_BAR(xsane.project_progress_bar), 0.0); xsane_multipage_project_set_sensitive(TRUE); xsane_set_sensitivity(TRUE); /* allow changing xsane mode */ -- cgit v1.2.3