Changeset a6c7ac9


Ignore:
Timestamp:
02/11/14 07:53:21 (8 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
fefc988
Parents:
7b61db6 (diff), a71cc41 (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 branch 'master' of github.com:pcbsd/pcbsd

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/installcd-packages

    r9b48476c ra71cc41  
    4242qt4-inputmethods-\*.txz 
    4343nvidia-driver-\*.txz 
     44nvidia-settings-\*.txz 
     45nvidia-xconfig-\*.txz 
    4446xwd-\*.txz 
    4547xvkbd-\*.txz 
  • src-qt4/PCDM/src/pcdm-backend.cpp

    r5e38281 r7b61db6  
    469469  usernameList.clear(); displaynameList.clear(); homedirList.clear(); 
    470470  //Get all the users from the file "/etc/passwd" 
    471   QStringList uList = pcbsd::Utils::runShellCommand("cat /etc/passwd"); 
    472  
     471  QStringList uList;// = pcbsd::Utils::runShellCommand("cat /etc/passwd"); 
     472  QFile PWF("/etc/passwd"); 
     473  if( PWF.open(QIODevice::ReadOnly | QIODevice::Text) ){ 
     474    QTextStream in(&PWF); 
     475      in.setCodec( "UTF-8" ); 
     476    while( !in.atEnd() ){ 
     477      uList << QString( in.readLine() ); 
     478    } 
     479  } 
    473480  //Remove all users that have: 
    474481  for(int i=0; i<uList.length(); i++){ 
Note: See TracChangeset for help on using the changeset viewer.