Changeset 4739c2e2


Ignore:
Timestamp:
11/13/13 10:41:17 (13 months ago)
Author:
Ken Moore <moorekou@…>
Branches:
master, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
cc05505
Parents:
0cb1016 (diff), cd17b83 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge pull request #5 from pkgdemon/master

Add .desktop files for Cinnamon, and Mate.

Files:
5 added
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/PCDM/src/main.cpp

    r999faef r81db2a4  
    146146  //} 
    147147  splash.show(); //show the splash screen again 
    148   QCoreApplication::processEvents(); 
     148  //Now wait a couple seconds for things to settle 
     149  QTime wTime = QTime::currentTime().addSecs(2); 
     150  while( QTime::currentTime() < wTime ){ 
     151    QCoreApplication::processEvents(QEventLoop::AllEvents,100); 
     152  } 
    149153  //check for shutdown process 
    150154  if(QFile::exists("/var/run/nologin")){ 
     
    152156    QCoreApplication::processEvents(); 
    153157    //Pause for a few seconds to prevent starting a new session during a shutdown 
    154     QTime wTime = QTime::currentTime().addSecs(30); 
     158    wTime = QTime::currentTime().addSecs(30); 
    155159    while( QTime::currentTime() < wTime ){  
    156160      //Keep processing events during the wait (for splashscreen) 
  • src-qt4/pc-xgui/resources/bin/rundetect.sh

    r2513d5a r40aa467  
    106106      cp ${PROGDIR}/cardDetect/XF86Config.compat /etc/X11/xorg.conf 
    107107    else 
     108      # Check if this system has a nvidia device, and run nvidia-xconfig 
     109      kldstat | grep -q 'nvidia' 
     110      if [ $? -eq 0 ] ; then 
     111         echo "Detected NVIDIA, creating xorg.conf" 
     112         nvidia-xconfig 2>/dev/null 
     113      fi 
    108114      AUTORES="YES" 
    109115    fi 
Note: See TracChangeset for help on using the changeset viewer.