[gtk+] Fix config dir <> data dir confusion

[Matthias Clasen <matthiasc src gnome org>]

commit fc7d26860a8b252f2d95e40366d2beaa7020b9d4
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Sep 6 09:42:01 2013 -0400

    Fix config dir <> data dir confusion
    
    We added code to look for settings.ini in system config dirs,
    and then proceeded to move it to /usr/share/gtk-3.0 :-(. So,
    look in that location as well.

 gtk/gtksettings.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 700d1ac..4eec096 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -313,6 +313,11 @@ gtk_settings_init (GtkSettings *settings)
     }
   g_free (pspecs);
 
+  path = g_build_filename (_gtk_get_data_prefix (), "share", "gtk-3.0", "settings.ini", NULL);
+  if (g_file_test (path, G_FILE_TEST_EXISTS))
+    gtk_settings_load_from_key_file (settings, path, GTK_SETTINGS_SOURCE_DEFAULT);
+  g_free (path);
+
   path = g_build_filename (_gtk_get_sysconfdir (), "gtk-3.0", "settings.ini", NULL);
   if (g_file_test (path, G_FILE_TEST_EXISTS))
     gtk_settings_load_from_key_file (settings, path, GTK_SETTINGS_SOURCE_DEFAULT);