modest_progress_bar_num_pending_operations (ModestProgressObject *self);
static void on_progress_changed (ModestMailOperation *mail_op,
+ ModestMailOperationState *state,
ModestProgressBarWidget *self);
static gboolean progressbar_clean (GtkProgressBar *bar);
}
static void
-destroy_observable_data (ObservableData *data)
-{
- g_signal_handler_disconnect (data->mail_op, data->signal_handler);
- g_object_unref (data->mail_op);
-}
-
-static void
modest_progress_bar_widget_finalize (GObject *obj)
{
ModestProgressBarWidgetPrivate *priv;
GSList *tmp;
for (tmp = priv->observables; tmp; tmp = g_slist_next (tmp)) {
- destroy_observable_data ((ObservableData *) tmp->data);
- g_free (tmp->data);
+ ObservableData *ob_data = tmp->data;
+ g_signal_handler_disconnect (ob_data->mail_op, ob_data->signal_handler);
+ g_object_unref (ob_data->mail_op);
+ g_free (ob_data);
}
g_slist_free (priv->observables);
priv->observables = NULL;
/* Find item */
tmp_data = g_malloc0 (sizeof (ObservableData));
- tmp_data->mail_op = g_object_ref (mail_op);
+ tmp_data->mail_op = mail_op;
link = g_slist_find_custom (priv->observables,
tmp_data,
(GCompareFunc) compare_observable_data);
/* Remove the item */
if (link) {
- priv->observables = g_slist_remove_link (priv->observables, link);
- destroy_observable_data ((ObservableData *) link->data);
+ ObservableData *ob_data = link->data;
+ g_signal_handler_disconnect (ob_data->mail_op, ob_data->signal_handler);
+ g_object_unref (ob_data->mail_op);
+ g_free (ob_data);
+ priv->observables = g_slist_delete_link (priv->observables, link);
+ tmp_data->mail_op = NULL;
+ link = NULL;
}
/* Update the current mail operation */
}
static void
on_progress_changed (ModestMailOperation *mail_op,
+ ModestMailOperationState *state,
ModestProgressBarWidget *self)
{
ModestProgressBarWidgetPrivate *priv;
gboolean determined = FALSE;
- ModestMailOperationId id;
priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (self);
/* If the mail operation is the currently shown one */
if (priv->current == mail_op) {
gchar *msg = NULL;
- gint done = modest_mail_operation_get_task_done (mail_op);
- gint total = modest_mail_operation_get_task_total (mail_op);
-
- determined = (done > 0 && total > 0);
- id = modest_mail_operation_get_id (mail_op);
+
+ determined = (state->done > 0 && state->total > 0) &
+ !(state->done == 1 && state->total == 100);
- switch (id) {
- case MODEST_MAIL_OPERATION_ID_RECEIVE:
+ switch (state->op_type) {
+ case MODEST_MAIL_OPERATION_TYPE_RECEIVE:
if (determined)
- msg = g_strdup_printf(_("mcen_me_receiving"), done, total);
+/* msg = g_strdup_printf(_("mcen_me_receiving"), done, total); */
+ msg = g_strdup_printf("Receiving %d/%d", state->done, state->total);
else
- msg = g_strdup(_("mail_me_receiving"));
+/* msg = g_strdup(_("mail_me_receiving")); */
+ msg = g_strdup("Receiving ...");
break;
- case MODEST_MAIL_OPERATION_ID_SEND:
+ case MODEST_MAIL_OPERATION_TYPE_SEND:
if (determined)
- msg = g_strdup_printf(_("mcen_me_sending"), done, total);
+ msg = g_strdup_printf(_("mcen_me_sending"), state->done, state->total);
else
msg = g_strdup(_("mail_me_sending"));
break;
- case MODEST_MAIL_OPERATION_ID_OPEN:
+ case MODEST_MAIL_OPERATION_TYPE_OPEN:
msg = g_strdup(_("mail_me_opening"));
break;
default:
msg = g_strdup("");
}
- modest_progress_bar_widget_set_progress (self, msg, done, total);
+ modest_progress_bar_widget_set_progress (self, msg, state->done, state->total);
g_free (msg);
}
}
void
modest_progress_bar_widget_set_progress (ModestProgressBarWidget *self,
const gchar *message,
- gint done,
- gint total)
+ guint done,
+ guint total)
{
ModestProgressBarWidgetPrivate *priv;
+ g_return_if_fail (MODEST_IS_PROGRESS_BAR_WIDGET(self));
+ g_return_if_fail (done <= total);
+
priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (self);
/* Set progress */