Merge lp:~azzar1/unity/fix-window-buttons into lp:unity

Proposed by Andrea Azzarone
Status: Merged
Approved by: Neil J. Patel
Approved revision: 1396
Merged at revision: 1397
Proposed branch: lp:~azzar1/unity/fix-window-buttons
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/PanelStyle.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/fix-window-buttons
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Andrea Cimitan (community) Approve
Review via email:
To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) wrote :

Definitely my fault, well spotted and patched correctly, as GTK_DATA_PREFIX is /usr or similar, not the whole path

review: Approve
Revision history for this message
Neil J. Patel (njpatel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/PanelStyle.cpp'
2--- plugins/unityshell/src/PanelStyle.cpp 2011-08-12 04:16:11 +0000
3+++ plugins/unityshell/src/PanelStyle.cpp 2011-08-19 12:19:26 +0000
4@@ -180,7 +180,7 @@
5 if (!var)
6 var = "/usr";
8- glib::String filename(g_build_filename(var, _theme_name, subpath.str().c_str(), NULL));
9+ glib::String filename(g_build_filename(var, "share", "themes", _theme_name, subpath.str().c_str(), NULL));
11 if (g_file_test(filename.Value(), G_FILE_TEST_EXISTS))
12 {