clear the progressbar unconditionally

diff --git a/ChangeLog.claws b/ChangeLog.claws
index acacc54849482ef39bbf5df15577ec57a62b97b0..46e235f1ba68d63142b2646e12e1e41067ba4893 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-08-08 [paul]      0.9.4claws10
+
+       * src/inc.c
+               clear the progress bar unconditionally
+

 2003-08-08 [paul]      0.9.4claws9
 
        * sync with 0.9.4cvs4
 2003-08-08 [paul]      0.9.4claws9
 
        * sync with 0.9.4cvs4

diff --git a/configure.ac b/configure.ac
index 851e160ae403afe260a3d9077029491ce8876dab..893fd87379db1a59ffffd9da9b164570b2ef6b72 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=9
+EXTRA_VERSION=10

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/inc.c b/src/inc.c
index c792e45ddc5371f65229f991667015c6edd7061d..6595a1a2b59b0a53b6351229df60d5350b51341f 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -400,12 +400,11 @@ static void inc_progress_dialog_clear(IncProgressDialog *inc_dialog)
 {
        progress_dialog_set_value(inc_dialog->dialog, 0.0);
        progress_dialog_set_label(inc_dialog->dialog, "");
 {
        progress_dialog_set_value(inc_dialog->dialog, 0.0);
        progress_dialog_set_label(inc_dialog->dialog, "");

-       if (inc_dialog->mainwin) {
-               gtk_progress_bar_update
-                       (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
+       if (inc_dialog->mainwin)

                gtk_progress_set_show_text
                        (GTK_PROGRESS(inc_dialog->mainwin->progressbar), FALSE);
                gtk_progress_set_show_text
                        (GTK_PROGRESS(inc_dialog->mainwin->progressbar), FALSE);

-       }
+       gtk_progress_bar_update
+               (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);

 }
 
 static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
 }
 
 static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)


@@ -414,12 +413,12 @@ static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
 
        inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
 
 
        inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
 

-       if (inc_dialog->mainwin) {
+       if (inc_dialog->mainwin)

                gtk_progress_set_show_text
                        (GTK_PROGRESS(inc_dialog->mainwin->progressbar), FALSE);
                gtk_progress_set_show_text
                        (GTK_PROGRESS(inc_dialog->mainwin->progressbar), FALSE);

-               gtk_progress_bar_update
-                       (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
-       }
+       gtk_progress_bar_update
+               (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
+

        progress_dialog_destroy(inc_dialog->dialog);
 
        g_free(inc_dialog);
        progress_dialog_destroy(inc_dialog->dialog);
 
        g_free(inc_dialog);