diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-01-16 14:20:16 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-01-16 14:20:16 +0100 |
| commit | ffdad5936a0d3d6a606cc446271dadbd57732abb (patch) | |
| tree | d62ce700fe5a0a1ddd075037f5874e155612af9f /unity-shared | |
| parent | c42718af3fee65ead2b8a94a58e26b581806fb73 (diff) | |
CMakeLists: export GTK_PREFIX on config.h instead of hardcoding one
(bzr r3566.5.215)
Diffstat (limited to 'unity-shared')
| -rw-r--r-- | unity-shared/DecorationStyle.cpp | 3 | ||||
| -rw-r--r-- | unity-shared/PanelStyle.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/unity-shared/DecorationStyle.cpp b/unity-shared/DecorationStyle.cpp index 5547a27f7..cde6ef3d8 100644 --- a/unity-shared/DecorationStyle.cpp +++ b/unity-shared/DecorationStyle.cpp @@ -17,6 +17,7 @@ * Authored by: Marco Trevisan <marco.trevisan@canonical.com> */ +#include "config.h" #include "DecorationStyle.h" #include <gtk/gtk.h> #include <NuxCore/Colors.h> @@ -284,7 +285,7 @@ struct Style::Impl const char* var = g_getenv("GTK_DATA_PREFIX"); if (!var) - var = "/usr"; + var = GTK_PREFIX; glib::String path(g_build_filename(var, "share", "themes", subpath.Value(), nullptr)); diff --git a/unity-shared/PanelStyle.cpp b/unity-shared/PanelStyle.cpp index ffdeb702a..2be041b56 100644 --- a/unity-shared/PanelStyle.cpp +++ b/unity-shared/PanelStyle.cpp @@ -86,8 +86,6 @@ Style::Style() deco_style->theme.changed.connect(sigc::mem_fun(this, &Style::OnThemeChanged)); deco_style->font.changed.connect(refresh_cb); deco_style->title_font.changed.connect(refresh_cb); - - RefreshContext(); } Style::~Style() |