Added all the bugs sent by the testers.

[modest] / src / maemo / modest-progress-bar-widget.c

diff --git a/src/maemo/modest-progress-bar-widget.c b/src/maemo/modest-progress-bar-widget.c
index 9459be1..5c8d239 100644 (file)
--- a/src/maemo/modest-progress-bar-widget.c
+++ b/src/maemo/modest-progress-bar-widget.c
@@ -218,9 +218,10 @@ static void
 modest_progress_bar_add_operation (ModestProgressObject *self,
                                   ModestMailOperation  *mail_op)
 {
-       ModestProgressBarWidget *me;
-       ObservableData *data;
-       ModestProgressBarWidgetPrivate *priv;
+       ModestProgressBarWidget *me = NULL;
+       ObservableData *data = NULL;
+       ModestProgressBarWidgetPrivate *priv = NULL;
+       ModestMailOperationState *state = NULL;
        
        me = MODEST_PROGRESS_BAR_WIDGET (self);
        priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (me);
@@ -233,11 +234,17 @@ modest_progress_bar_add_operation (ModestProgressObject *self,
                                                 me);
        if (priv->observables == NULL) {
                priv->current = mail_op;
+
+               /* Call progress_change handler to initialize progress message */
+               state = g_malloc0(sizeof(ModestMailOperationState));
+               state->done = 0;
+               state->total = 0;
+               state->op_type = modest_mail_operation_get_type_operation (mail_op);;
+               on_progress_changed (mail_op, state, me);
+               g_free(state);
        }
        priv->observables = g_slist_append (priv->observables, data);
 
-       /* Call progress_change handler to initialize progress message */
-/*     on_progress_changed (mail_op, me); */
 }
 
 static gint
@@ -360,7 +367,7 @@ on_progress_changed (ModestMailOperation  *mail_op,
                }
                
                /* If we have byte information use it */
-               if ((state->bytes_done == 0) && (state->bytes_total == 0))
+               if ((state->bytes_done != 0) && (state->bytes_total != 0))
                        modest_progress_bar_widget_set_progress (self, msg, 
                                                                 state->bytes_done, 
                                                                 state->bytes_total);
@@ -400,13 +407,22 @@ modest_progress_bar_widget_set_progress (ModestProgressBarWidget *self,
        g_return_if_fail (done <= total);
        
        priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (self);
-       
-       /* Set progress */
-       if (total != 100) /* FIXME: tinymail send 1/100 when it doesn't know better.. */
-               gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress_bar),
-                                              (gdouble)done/(gdouble)total);
-       else
+
+       /* Set progress. Tinymail sometimes returns us 1/100 when it
+          does not have any clue, NOTE that 1/100 could be also a
+          valid progress (we will loose it), but it will be recovered
+          once the done is greater than 1 */
+       if ((done == 0 && total == 0) || 
+           (done == 1 && total == 100)) {
                gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->progress_bar));
+       } else {
+               gdouble percent = 0;
+               if (total != 0) /* Avoid division by zero. */
+                       percent = (gdouble)done/(gdouble)total;
+
+               gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress_bar),
+                                                      percent);
+       }
 
        /* Set text */
        gtk_progress_bar_set_text (GTK_PROGRESS_BAR (priv->progress_bar), message);