diff options
| author | Ken Moore <moorekou@gmail.com> | 2014-09-23 09:38:48 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2014-09-23 09:38:48 -0400 |
| commit | d5cbfb62c666a44aa8df9f5f5930bb77c3165339 (patch) | |
| tree | 686cb0fa28030f23cf09e01b93d4c566a1d3efcc /lumina-desktop | |
| parent | Tag Lumina version 0.6.3 (diff) | |
| parent | Applied Debian patch to enable building on 32-bit Linux machines. Project (diff) | |
| download | lumina-d5cbfb62c666a44aa8df9f5f5930bb77c3165339.tar.gz lumina-d5cbfb62c666a44aa8df9f5f5930bb77c3165339.tar.bz2 lumina-d5cbfb62c666a44aa8df9f5f5930bb77c3165339.zip | |
Merge pull request #11 from slicer69/master
Enabling building on 32-bit Linux, fixed compiler warning.
Diffstat (limited to 'lumina-desktop')
| -rw-r--r-- | lumina-desktop/LDesktop.cpp | 10 | ||||
| -rw-r--r-- | lumina-desktop/lumina-desktop.pro | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp index c51f5de0..2b661110 100644 --- a/lumina-desktop/LDesktop.cpp +++ b/lumina-desktop/LDesktop.cpp @@ -303,12 +303,12 @@ void LDesktop::DesktopPluginRemoved(QString ID){ //qDebug() << "- found ID"; //Delete the plugin container first QList<QMdiSubWindow*> wins = bgDesktop->subWindowList(); - for(int i=0; i<wins.length(); i++){ - if(wins[i]->whatsThis()==ID || wins[i]->whatsThis().isEmpty()){ + for(int j=0; j<wins.length(); j++){ + if(wins[j]->whatsThis()==ID || wins[j]->whatsThis().isEmpty()){ //wins[i]->setWhatsThis(""); //clear this so it knows it is being temporarily removed - bgDesktop->removeSubWindow(wins[i]->widget()); //unhook plugin from container - bgDesktop->removeSubWindow(wins[i]); //remove container from screen - delete wins[i]; //delete old container + bgDesktop->removeSubWindow(wins[j]->widget()); //unhook plugin from container + bgDesktop->removeSubWindow(wins[j]); //remove container from screen + delete wins[j]; //delete old container } } //Now delete the plugin itself diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro index edc63010..f2fa139d 100644 --- a/lumina-desktop/lumina-desktop.pro +++ b/lumina-desktop/lumina-desktop.pro @@ -86,7 +86,7 @@ RESOURCES+= Lumina-DE.qrc INCLUDEPATH += ../libLumina /usr/local/include desktop.files = Lumina-DE.desktop -linux-g++-64 { +linux-* { desktop.path = /usr/share/xsessions } else { desktop.path = /usr/local/share/xsessions |