[gimp] app: move color history loading/saving to core/gimp-palettes.c

[Michael Natterer <mitch src gnome org>]

commit ac90ba1dc491c074538ae0290df298b4d01320d2
Author: Michael Natterer <mitch gimp org>
Date:   Thu Nov 27 01:10:46 2014 +0100

    app: move color history loading/saving to core/gimp-palettes.c
    
    and remove gui/color-history.[ch] completely.

 app/core/gimp-palettes.c |   42 +++++++++++++++++++++++++
 app/core/gimp-palettes.h |    3 ++
 app/core/gimp.c          |    5 +++
 app/gui/Makefile.am      |    2 -
 app/gui/color-history.c  |   77 ----------------------------------------------
 app/gui/color-history.h  |   31 ------------------
 app/gui/gui.c            |    5 ---
 7 files changed, 50 insertions(+), 115 deletions(-)
---
diff --git a/app/core/gimp-palettes.c b/app/core/gimp-palettes.c
index 3059bf6..2a6b716 100644
--- a/app/core/gimp-palettes.c
+++ b/app/core/gimp-palettes.c
@@ -23,6 +23,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimp.h"
@@ -60,6 +62,46 @@ gimp_palettes_init (Gimp *gimp)
   gimp_context_set_palette (gimp->user_context, palette);
 }
 
+void
+gimp_palettes_load (Gimp *gimp)
+{
+  GimpPalette *palette;
+  GFile       *file;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  palette = gimp_palettes_get_color_history (gimp);
+
+  file = gimp_directory_file ("colorrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Parsing '%s'\n", gimp_file_get_utf8_name (file));
+
+  gimp_palette_mru_load (GIMP_PALETTE_MRU (palette), file);
+
+  g_object_unref (file);
+}
+
+void
+gimp_palettes_save (Gimp *gimp)
+{
+  GimpPalette *palette;
+  GFile       *file;
+
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  palette = gimp_palettes_get_color_history (gimp);
+
+  file = gimp_directory_file ("colorrc", NULL);
+
+  if (gimp->be_verbose)
+    g_print ("Writing '%s'\n", gimp_file_get_utf8_name (file));
+
+  gimp_palette_mru_save (GIMP_PALETTE_MRU (palette), file);
+
+  g_object_unref (file);
+}
+
 GimpPalette *
 gimp_palettes_get_color_history (Gimp *gimp)
 {
diff --git a/app/core/gimp-palettes.h b/app/core/gimp-palettes.h
index 0d7e950..036bfa9 100644
--- a/app/core/gimp-palettes.h
+++ b/app/core/gimp-palettes.h
@@ -24,6 +24,9 @@
 
 void          gimp_palettes_init              (Gimp *gimp);
 
+void          gimp_palettes_load              (Gimp *gimp);
+void          gimp_palettes_save              (Gimp *gimp);
+
 GimpPalette * gimp_palettes_get_color_history (Gimp *gimp);
 
 
diff --git a/app/core/gimp.c b/app/core/gimp.c
index aceb3cc..d1e00a6 100644
--- a/app/core/gimp.c
+++ b/app/core/gimp.c
@@ -810,6 +810,8 @@ gimp_real_exit (Gimp     *gimp,
 
   gimp_fonts_reset (gimp);
 
+  gimp_palettes_save (gimp);
+
   gimp_templates_save (gimp);
   gimp_parasiterc_save (gimp);
   gimp_unitrc_save (gimp);
@@ -1063,6 +1065,9 @@ gimp_restore (Gimp               *gimp,
   if (! gimp->no_fonts)
     gimp_fonts_load (gimp);
 
+  /*  initialize the color history   */
+  gimp_palettes_load (gimp);
+
   /*  initialize the list of gimp tool presets if we have a GUI  */
   if (! gimp->no_interface)
     {
diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am
index 8487b5d..a97a3cf 100644
--- a/app/gui/Makefile.am
+++ b/app/gui/Makefile.am
@@ -22,8 +22,6 @@ AM_CPPFLAGS = \
 noinst_LIBRARIES = libappgui.a
 
 libappgui_a_sources = \
-       color-history.c         \
-       color-history.h         \
        gimpdbusservice.c       \
        gimpdbusservice.h       \
        gimpuiconfigurer.c      \
diff --git a/app/gui/gui.c b/app/gui/gui.c
index 4699370..f3d7af5 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -70,7 +70,6 @@
 
 #include "dialogs/dialogs.h"
 
-#include "color-history.h"
 #include "gimpuiconfigurer.h"
 #include "gui.h"
 #include "gui-unique.h"
@@ -597,8 +596,6 @@ gui_restore_after_callback (Gimp               *gimp,
   if (status_callback == splash_update)
     splash_destroy ();
 
-  color_history_restore (gimp);
-
   if (gimp_get_show_gui (gimp))
     {
       GimpDisplayShell *shell;
@@ -660,8 +657,6 @@ gui_exit_callback (Gimp     *gimp,
   if (gui_config->save_session_info)
     session_save (gimp, FALSE);
 
-  color_history_save (gimp);
-
   if (gui_config->save_accels)
     menus_save (gimp, FALSE);