summaryrefslogtreecommitdiff
path: root/src/screen.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/screen.cpp')
-rw-r--r--src/screen.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/screen.cpp b/src/screen.cpp
index e56d2e0..2c9c2e2 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1065,6 +1065,7 @@ PrivateScreen::handleSelectionClear (XEvent *event)
bool
CompScreen::readImageFromFile (CompString &name,
+ CompString &pname,
CompSize &size,
void *&data)
{
@@ -1082,6 +1083,8 @@ CompScreen::readImageFromFile (CompString &name,
path += "/";
path += HOME_IMAGEDIR;
path += "/";
+ path += pname;
+ path += "/";
path += name;
status = fileToImage (path, size, stride, data);
@@ -1092,6 +1095,8 @@ CompScreen::readImageFromFile (CompString &name,
path = IMAGEDIR;
path += "/";
+ path += pname;
+ path += "/";
path += name;
status = fileToImage (path, size, stride, data);
}
@@ -3857,6 +3862,7 @@ bool
CompScreen::updateDefaultIcon ()
{
CompString file = priv->optionGetDefaultIcon ();
+ CompString pname = "";
void *data;
CompSize size;
@@ -3866,7 +3872,7 @@ CompScreen::updateDefaultIcon ()
priv->defaultIcon = NULL;
}
- if (!readImageFromFile (file, size, data))
+ if (!readImageFromFile (file, pname, size, data))
return false;
priv->defaultIcon = new CompIcon (screen, size.width (), size.height ());