[pan2] fix patches

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

commit 3f8a7f7f56dfda9a35babcead258122c184086dd
Author: Heinrich Müller <heinrich mueller82 gmail com>
Date:   Sun Mar 23 13:47:54 2014 +0100

    fix patches

 pan/gui/body-pane.cc          |    8 ++++----
 pan/gui/group-prefs-dialog.cc |    8 ++++----
 pan/gui/header-pane.cc        |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index e14c64e..8bafb23 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -507,6 +507,10 @@ namespace
     get_or_create_tag (table, "pixbuf");
     get_or_create_tag (table, "quote_0");
 
+    g_object_set (get_or_create_tag (table, "text"),
+      "foreground", p.get_color_str ("text-color-fg", fg).c_str(),
+      "background", p.get_color_str ("text-color-bg", bg).c_str(),
+      NULL);
     g_object_set (get_or_create_tag(table,"bold"),
       "weight", PANGO_WEIGHT_BOLD,
       NULL);
@@ -537,10 +541,6 @@ namespace
       "foreground", p.get_color_str ("body-pane-color-signature", TANGO_SKY_BLUE_LIGHT).c_str(),
       "background", p.get_color_str ("body-pane-color-signature-bg", bg).c_str(),
       NULL);
-    g_object_set (get_or_create_tag (table, "text"),
-      "foreground", p.get_color_str ("text-color-fg", fg).c_str(),
-      "background", p.get_color_str ("text-color-bg", bg).c_str(),
-      NULL);
   }
 }
 
diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc
index b0e48c8..8b0f596 100644
--- a/pan/gui/group-prefs-dialog.cc
+++ b/pan/gui/group-prefs-dialog.cc
@@ -246,12 +246,12 @@ namespace
   GtkWidget* new_color_button (const Quark& group, Prefs& prefs, GroupPrefs& gprefs, GroupPrefsDialog* 
dialog, GtkWidget* w)
   {
 
-    GtkWidget * b = gtk_color_button_new_with_color (&val);
-    
+    const PanColors& colors (PanColors::get());
     const std::string& def_fg (colors.def_fg);
     const std::string& fg (prefs.get_color_str("group-pane-color-fg", def_fg));
-       const GdkColor& val (gprefs.get_group_color (group, fg));
-    
+    const GdkColor& val (gprefs.get_group_color (group, fg));
+
+    GtkWidget * b = gtk_color_button_new_with_color (&val);
     g_signal_connect (b, "color-set", G_CALLBACK(color_set_cb), dialog);
 
     return b;
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index f380021..dd1be23 100644
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@ -1994,7 +1994,7 @@ HeaderPane :: HeaderPane (ActionManager       & action_manager,
   _gui (gui),
   _cleared (true),
   _fg(prefs.get_color_str_wo_fallback ("text-color-fg")),
-  _bg(prefs.get_color_str ("text-color-bg", def_color_str))
+  _bg(prefs.get_color_str_wo_fallback ("text-color-bg"))
 {
 
   // init the icons