From 2688ccdbc4c8976ba4f7d681533d70ab9edc8b32 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 22 Oct 2011 08:48:13 +0200 Subject: gtk: clean up the private horror - add gtkmodulesprivate.h and move stuff there from gtkprivate.h - add gtkprivate.c and move stuff there from gtkmain.c - add gtkwin32.c and move stuff there from gtkmain.c - don't redefine GTK_DATADIR and friends in gtkprivate.h - have _gtk_get_datadir() and friends on all platforms - remove the horrid hacks where gtkprivate.h can't be included, or must be included later due to redefinition of the compile-time directories --- gtk/gtkmodules.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gtk/gtkmodules.c') diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c index 451b3fbf5f..cdd85db5e1 100644 --- a/gtk/gtkmodules.c +++ b/gtk/gtkmodules.c @@ -23,9 +23,10 @@ #include #include "gtkmodules.h" +#include "gtkmodulesprivate.h" #include "gtksettings.h" #include "gtkdebug.h" -#include "gtkprivate.h" /* GTK_LIBDIR */ +#include "gtkprivate.h" #include "gtkmainprivate.h" #include "gtkintl.h" @@ -74,7 +75,7 @@ get_module_path (void) if (exe_prefix) default_dir = g_build_filename (exe_prefix, "lib", "gtk-3.0", NULL); else - default_dir = g_build_filename (GTK_LIBDIR, "gtk-3.0", NULL); + default_dir = g_build_filename (_gtk_get_libdir (), "gtk-3.0", NULL); if (module_path_env && home_gtk_dir) module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S, -- cgit v1.2.1