[gtk+/gtk-2-24] Fix config dir <> data dir confusion
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] Fix config dir <> data dir confusion
- Date: Fri, 6 Sep 2013 13:50:22 +0000 (UTC)
commit 956f5e3f6b250251d111388c8d26734dffe52454
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Sep 6 09:49:30 2013 -0400
Fix config dir <> data dir confusion
We added code to look for gtkrc in system config dirs,
and then proceeded to move it to /usr/share/gtk-2.0 :-(.
So, look in that location as well.
gtk/gtkrc.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index f0677aa..b1f68e2 100644
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -525,6 +525,10 @@ gtk_rc_add_initial_default_files (void)
const gchar * const *config_dirs;
const gchar *config_dir;
+ str = g_build_filename (GTK_DATA_PREFIX, "gtk-2.0", "gtkrc", NULL);
+ gtk_rc_add_default_file (str);
+ g_free (str);
+
config_dirs = g_get_system_config_dirs ();
for (config_dir = *config_dirs; *config_dirs != NULL; config_dirs++)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]