* Some initializations

* Removed unused code

pmo-trunk-r732

diff --git a/src/gtk/modest-edit-msg-window.c b/src/gtk/modest-edit-msg-window.c
index b31f8e2..e2a4d0a 100644 (file)
--- a/src/gtk/modest-edit-msg-window.c
+++ b/src/gtk/modest-edit-msg-window.c
@@ -325,7 +325,7 @@ modest_edit_msg_window_set_msg (ModestEditMsgWindow *self, TnyMsg *msg)
        if (bcc)
                gtk_entry_set_text (GTK_ENTRY(priv->bcc_field), bcc);
        if (subject)
-               gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);   
+               gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
        
        buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body));
        gtk_text_buffer_set_text (buf,

diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index 09390a7..19d1879 100644 (file)
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -123,7 +123,7 @@ modest_formatter_do (ModestFormatter *self,
                     TnyHeader *header,
                     FormatterFunc func)
 {
-       TnyMsg *new_msg;
+       TnyMsg *new_msg = NULL;
        gchar *body_text = NULL, *txt = NULL;
        ModestFormatterPrivate *priv;
        TnyPlatformFactory *fact;

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 5ea906b..8c1aa43 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -349,8 +349,8 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, gu
        tny_header_set_replyto (new_header, from);
 
        /* Change the subject */
-       new_subject = 
-               (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header), 
+       new_subject =
+               (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header),
                                                             (is_reply) ? _("Re:") : _("Fwd:"));
        tny_header_set_subject (new_header, (const gchar *) new_subject);
        g_free (new_subject);
@@ -392,7 +392,7 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg,
                                         ModestMailOperationReplyType reply_type,
                                         ModestMailOperationReplyMode reply_mode)
 {
-       TnyMsg *new_msg;
+       TnyMsg *new_msg = NULL;
        TnyHeader *new_header, *header;
        const gchar* reply_to;
        gchar *new_cc = NULL;
@@ -429,8 +429,8 @@ modest_mail_operation_create_reply_mail (TnyMsg *msg,
                /* Remove my own address from the cc list. TODO:
                   remove also the To: of the new message, needed due
                   to the new reply_to feature */
-               new_cc = (gchar *) 
-                       modest_text_utils_remove_address ((const gchar *) tmp->str, 
+               new_cc = (gchar *)
+                       modest_text_utils_remove_address ((const gchar *) tmp->str,
                                                          from);
                /* FIXME: remove also the mails from the new To: */
                tny_header_set_cc (new_header, new_cc);

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 102c4e5..3a36c89 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -586,20 +586,6 @@ modest_folder_view_get_selected (ModestFolderView *self)
        return priv->cur_folder;
 }
 
-
-
-static const gchar*
-get_account_name (TnyFolder *folder)
-{
-       TnyAccount *account;
-
-       account = tny_folder_get_account (folder);
-       if (!account)
-               return NULL;
-       else
-               return tny_account_get_name (account);
-       
-}
        
 static gint
 cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,