[pan2/testing: 190/279] last commit for now, forgot something

[Heinrich MÃller <henmull src gnome org>]

commit 528e7be07cad8b8fb05b33082b8f12d6c760277d
Author: Heinrich MÃller <sphemuel stud informatik uni-erlangen de>
Date:   Sun Jul 31 12:43:35 2011 +0200

    last commit for now, forgot something

 pan/gui/post-ui.cc       |    2 +-
 pan/tasks/task-upload.cc |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 4b443ef..8e8490d 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -596,7 +596,7 @@ PostUI :: add_actions (GtkWidget * box)
                                 _prefs.get_flag ("spellcheck-enabled", DEFAULT_SPELLCHECK_FLAG));
   gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (gtk_action_group_get_action (_agroup, "wrap")),
                                 _prefs.get_flag ("compose-wrap-enabled", true));
-  gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (gtk_action_group_get_action (_agroup, "inline-or-bulk")), false);
+//  gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (gtk_action_group_get_action (_agroup, "inline-or-bulk")), false);
   gtk_ui_manager_insert_action_group (_uim, _agroup, 0);
 
    //add popup actions
diff --git a/pan/tasks/task-upload.cc b/pan/tasks/task-upload.cc
index 4deb104..e5af38f 100644
--- a/pan/tasks/task-upload.cc
+++ b/pan/tasks/task-upload.cc
@@ -210,13 +210,11 @@ TaskUpload :: prepend_headers(GMimeMessage* msg, TaskUpload::Needed * n, std::st
 
     char * all;
     if (_first && _queue_pos==-1)
-    {
       all = g_mime_object_to_string ((GMimeObject *) msg);
-      g_free(all);
-    }
     else
       all = g_mime_object_get_headers ((GMimeObject *) msg);
     out << all << "\n";
+    if (_first && _queue_pos == -1) g_free(all);
     out << d;
     d = out.str();