diff -uprN mate-control-center/font-viewer/font-model.c mate-control-center-test/font-viewer/font-model.c

--- mate-control-center/font-viewer/font-model.c	2015-08-24 13:20:26.663072000 +0200

+++ mate-control-center-test/font-viewer/font-model.c	2015-08-24 13:44:33.156124566 +0200

@@ -440,8 +440,6 @@ font_view_model_init (FontViewModel *sel

     self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, FONT_VIEW_TYPE_MODEL, FontViewModelPrivate);

-    if (!FcInit())

-        g_critical ("Can't initialize fontconfig library");

     if (FT_Init_FreeType (&self->priv->library) != FT_Err_Ok)

         g_critical ("Can't initialize FreeType library");

diff -uprN mate-control-center/font-viewer/font-view.c mate-control-center-test/font-viewer/font-view.c

--- mate-control-center/font-viewer/font-view.c	2015-08-24 12:32:22.452695000 +0200

+++ mate-control-center-test/font-viewer/font-view.c	2015-08-24 13:47:59.775295255 +0200

@@ -31,6 +31,7 @@

 #include FT_SFNT_NAMES_H

 #include FT_TRUETYPE_IDS_H

 #include <cairo/cairo-ft.h>

+#include <fontconfig/fontconfig.h>

 #include <gio/gio.h>

 #include <gtk/gtk.h>

 #include <glib/gi18n.h>

@@ -654,6 +655,14 @@ font_view_application_activate (GApplica

 }

 static void

+font_view_application_quit_mainloop (GApplication *application)

+{

+    G_APPLICATION_CLASS (font_view_application_parent_class)->quit_mainloop (application);

+

+    FcFini ();

+}

+

+static void

 font_view_application_dispose (GObject *obj)

 {

     FontViewApplication *self = FONT_VIEW_APPLICATION (obj);

@@ -678,6 +687,7 @@ font_view_application_class_init (FontVi

     aclass->activate = font_view_application_activate;

     aclass->startup = font_view_application_startup;

     aclass->open = font_view_application_open;

+    aclass->quit_mainloop = font_view_application_quit_mainloop;

     oclass->dispose = font_view_application_dispose;

 }

@@ -686,6 +696,10 @@ static GApplication *

 font_view_application_new (void)

 {

     g_type_init ();

+

+    if (!FcInit ())

+        g_critical ("Can't initialize fontconfig library");

+

     return g_object_new (FONT_VIEW_TYPE_APPLICATION,

                          "application-id", "org.mate.font-viewer",

                          "flags", G_APPLICATION_HANDLES_OPEN,