From 383611ae82a60da4a2b2d890c45a1630b9e1b0ff Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Fri, 27 Oct 2017 09:00:57 -0400 Subject: mq_application_new(): Set resources directory --- (limited to 'src') diff --git a/src/application.c b/src/application.c index e926e6f..b372d23 100644 --- a/src/application.c +++ b/src/application.c @@ -19,6 +19,10 @@ * along with Marquee. If not, see . */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "application.h" #include @@ -36,6 +40,7 @@ struct MqApplication { MqConfig *config; WebKitSettings *settings; gboolean marquee_mode; + gchar *resources_dir; }; static void @@ -71,6 +76,14 @@ mq_application_new(gchar G_GNUC_UNUSED *profile, gboolean G_GNUC_UNUSED private) application->windows = NULL; application->marquee_mode = FALSE; +#if defined(RUN_IN_PLACE) && RUN_IN_PLACE + application->resources_dir = g_build_filename(ABS_TOP_BUILDDIR, + "data", "resources", NULL); +#else + application->resources_dir = g_build_filename(PKGDATADIR, "resources", + NULL); +#endif + set_webkit_settings(application); return application; -- cgit v0.9.1