diff options
| author | william <william.os4y@gmail.com> | 2015-03-26 19:18:45 +0100 |
|---|---|---|
| committer | william <william.os4y@gmail.com> | 2015-03-26 19:18:45 +0100 |
| commit | 851c91e92ef57de3cdec582048a134ff5b5552f8 (patch) | |
| tree | 8d7119048c2ca9b3f60c9a8a2f5699f6a18eb1b2 /lumina-desktop/LWinInfo.cpp | |
| parent | Warn the user is they want to change a elemnt having translated values. (diff) | |
| parent | Actually move the file/dir copy onto itself check earlier in the procedure, t... (diff) | |
| download | lumina-851c91e92ef57de3cdec582048a134ff5b5552f8.tar.gz lumina-851c91e92ef57de3cdec582048a134ff5b5552f8.tar.bz2 lumina-851c91e92ef57de3cdec582048a134ff5b5552f8.zip | |
Merge remote-tracking branch 'upstream/master' into deskEditor
Diffstat (limited to 'lumina-desktop/LWinInfo.cpp')
| -rw-r--r-- | lumina-desktop/LWinInfo.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lumina-desktop/LWinInfo.cpp b/lumina-desktop/LWinInfo.cpp index 4ea91c1f..b1476c4e 100644 --- a/lumina-desktop/LWinInfo.cpp +++ b/lumina-desktop/LWinInfo.cpp @@ -15,9 +15,11 @@ QString LWinInfo::text(){ if(window==0){ return ""; } QString nm = LSession::handle()->XCB->WindowVisibleIconName(window); - if(nm.isEmpty()){ nm = LSession::handle()->XCB->WindowIconName(window); } - if(nm.isEmpty()){ nm = LSession::handle()->XCB->WindowVisibleName(window); } - if(nm.isEmpty()){ nm = LSession::handle()->XCB->WindowName(window); } + if(nm.simplified().isEmpty()){ nm = LSession::handle()->XCB->WindowIconName(window); } + if(nm.simplified().isEmpty()){ nm = LSession::handle()->XCB->WindowVisibleName(window); } + if(nm.simplified().isEmpty()){ nm = LSession::handle()->XCB->WindowName(window); } + if(nm.simplified().isEmpty()){ nm = LSession::handle()->XCB->OldWindowIconName(window); } + if(nm.simplified().isEmpty()){ nm = LSession::handle()->XCB->OldWindowName(window); } return nm; } |