Work to complete implementation of purge attachments operation

[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 63d971a..b995180 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
@@ -333,7 +340,7 @@ on_progress_changed (ModestMailOperation  *mail_op,
        if (priv->current == mail_op) {
                gchar *msg = NULL;
                
-               determined = (state->done > 0 && state->total > 0) & 
+               determined = (state->done > 0 && state->total > 0) && 
                        !(state->done == 1 && state->total == 100);
 
                switch (state->op_type) {
@@ -359,7 +366,15 @@ on_progress_changed (ModestMailOperation  *mail_op,
                        msg = g_strdup("");
                }
                
-               modest_progress_bar_widget_set_progress (self, msg, state->done, state->total);
+               /* If we have byte information use it */
+               if ((state->bytes_done != 0) && (state->bytes_total != 0))
+                       modest_progress_bar_widget_set_progress (self, msg, 
+                                                                state->bytes_done, 
+                                                                state->bytes_total);
+               else
+                       modest_progress_bar_widget_set_progress (self, msg,
+                                                                state->done,
+                                                                state->total);
                g_free (msg);
        }
 }
@@ -381,10 +396,10 @@ modest_progress_bar_widget_new ()
 
 
 void 
-modest_progress_bar_widget_set_progress   (ModestProgressBarWidget *self,
-                                          const gchar *message,
-                                          guint done,
-                                          guint total)
+modest_progress_bar_widget_set_progress (ModestProgressBarWidget *self,
+                                        const gchar *message,
+                                        gint done,
+                                        gint total)
 {
        ModestProgressBarWidgetPrivate *priv;
        
@@ -394,10 +409,14 @@ modest_progress_bar_widget_set_progress   (ModestProgressBarWidget *self,
        priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (self);
        
        /* Set progress */
-       if (total != 100) /* FIXME: tinymail send 1/100 when it doesn't know better.. */
+       if (total != 100) /* FIXME: tinymail send 1/100 when it doesn't know better.. */ {
+               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),
-                                              (gdouble)done/(gdouble)total);
-       else
+                                              percent);
+       }else
                gtk_progress_bar_pulse (GTK_PROGRESS_BAR (priv->progress_bar));
 
        /* Set text */