Modified webpage: now tinymail repository is in gitorious.

[modest] / src / widgets / modest-progress-bar.c

diff --git a/src/widgets/modest-progress-bar.c b/src/widgets/modest-progress-bar.c
index eaea581..5e3e03b 100644 (file)
--- a/src/widgets/modest-progress-bar.c
+++ b/src/widgets/modest-progress-bar.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <widgets/modest-combo-box.h>
 #include "widgets/modest-progress-bar.h"
 #include "modest-tny-account.h"
 #include "modest-platform.h"
@@ -182,7 +181,8 @@ modest_progress_bar_init (ModestProgressBar *self)
 
        /* Build GtkProgressBar */
        adj = (GtkAdjustment *) gtk_adjustment_new (0, LOWER, UPPER, 0, 0, 0);
-       priv->progress_bar = gtk_progress_bar_new_with_adjustment (adj);                
+       priv->progress_bar = gtk_progress_bar_new ();
+       g_object_set (priv->progress_bar, "adjustment", adj, NULL);
        req.width = 228;
        req.height = 64;
        gtk_progress_set_text_alignment (GTK_PROGRESS (priv->progress_bar), 0, 0.5);
@@ -350,11 +350,6 @@ modest_progress_bar_cancel_current_operation (ModestProgressObject *self)
 static void 
 modest_progress_bar_cancel_all_operations (ModestProgressObject *self)
 {
-       ModestProgressBar *me;
-       ModestProgressBarPrivate *priv;
-
-       me = MODEST_PROGRESS_BAR (self);
-       priv = MODEST_PROGRESS_BAR_GET_PRIVATE (me);
 
        /* Cancel all the mail operations */
        modest_mail_operation_queue_cancel_all (modest_runtime_get_mail_operation_queue ());
@@ -387,9 +382,6 @@ progress_string (ModestMailOperationTypeOperation op_type, guint done, guint tot
                        msg = g_strdup(_("mail_me_sending"));
                break;
                
-       case MODEST_MAIL_OPERATION_TYPE_OPEN:           
-               msg = g_strdup(_("mail_me_opening"));
-               break;
        default:
                msg = g_strdup("");
        }