* leak fixes; free both list and its elements when we call modest_account_mgr_account...

[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 c302d3c..63d971a 100644 (file)
--- a/src/maemo/modest-progress-bar-widget.c
+++ b/src/maemo/modest-progress-bar-widget.c
@@ -184,20 +184,14 @@ modest_progress_bar_widget_init (ModestProgressBarWidget *self)
        gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR (priv->progress_bar), PANGO_ELLIPSIZE_END);
        gtk_widget_size_request (priv->progress_bar, &req);
        gtk_container_add (GTK_CONTAINER (align), priv->progress_bar);
-       
+       gtk_widget_size_request (align, &req);
+
        /* Add progress bar widget */   
        gtk_box_pack_start (GTK_BOX(self), align, TRUE, TRUE, 0);
        gtk_widget_show_all (GTK_WIDGET(self));       
 }
 
 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;
@@ -207,8 +201,10 @@ modest_progress_bar_widget_finalize (GObject *obj)
                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;
@@ -235,7 +231,6 @@ modest_progress_bar_add_operation (ModestProgressObject *self,
                                                 "progress-changed",
                                                 G_CALLBACK (on_progress_changed),
                                                 me);
-
        if (priv->observables == NULL) {
                priv->current = mail_op;
        }
@@ -268,15 +263,20 @@ modest_progress_bar_remove_operation (ModestProgressObject *self,
 
        /* 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 */
@@ -339,15 +339,15 @@ on_progress_changed (ModestMailOperation  *mail_op,
                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("Receiving %d/%d", state->done, state->total);
+                               msg = g_strdup_printf(_("mcen_me_receiving"),
+                                                     state->done, state->total); 
                        else 
-/*                             msg = g_strdup(_("mail_me_receiving")); */
-                               msg = g_strdup("Receiving ...");
+                               msg = g_strdup(_("mail_me_receiving"));
                        break;
                case MODEST_MAIL_OPERATION_TYPE_SEND:           
                        if (determined)
-                               msg = g_strdup_printf(_("mcen_me_sending"), state->done, state->total);
+                               msg = g_strdup_printf(_("mcen_me_sending"), state->done,
+                                                     state->total);
                        else 
                                msg = g_strdup(_("mail_me_sending"));
                        break;
@@ -394,7 +394,7 @@ modest_progress_bar_widget_set_progress   (ModestProgressBarWidget *self,
        priv = MODEST_PROGRESS_BAR_WIDGET_GET_PRIVATE (self);
        
        /* Set progress */
-       if (total != 0)
+       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