~tatokis/unity/gcc-72-errors

« back to all changes in this revision

Viewing changes to unity-shared/DashStyle.cpp

  • Committer: Marco Trevisan (Treviño)
  • Date: 2016-08-31 15:05:58 UTC
  • mto: (4153.9.32 systemd-unit-fixes)
  • mto: This revision was merged to the branch mainline in revision 4191.
  • Revision ID: mail@3v1n0.net-20160831150558-wiky13q96ug5fib2
CMake: use UNITY_LIBDIR in a more shared way

Show diffs side-by-side

added added

removed removed

Lines of Context:
44
44
#include "UnitySettings.h"
45
45
#include "config.h"
46
46
 
47
 
#define DASH_WIDGETS_FILE UNITYDATADIR"/themes/dash-widgets.json"
 
47
#define DASH_WIDGETS_FILE UNITY_DATADIR"/themes/dash-widgets.json"
48
48
 
49
49
namespace unity
50
50
{
303
303
  // is initialised.
304
304
  SetDefaultValues();
305
305
 
306
 
  if (!parser.Open(theme::Settings::Get()->ThemedFilePath("dash-widgets", {UNITYDATADIR"/themes"}, {"json"})))
 
306
  if (!parser.Open(theme::Settings::Get()->ThemedFilePath("dash-widgets", {UNITY_DATADIR"/themes"}, {"json"})))
307
307
  {
308
308
    LOG_ERROR(logger) << "Impossible to find a dash-widgets.json in theme paths";
309
309
    return;