Changeset c0e9a55


Ignore:
Timestamp:
12/27/13 12:05:17 (17 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
4f9718b
Parents:
67e0ce1 (diff), 534c70e (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
  • src-qt4/pc-mounttray/devCheck.cpp

    re020f6a rc930de6  
    4141  devDir.cd(DEVICEDIR); 
    4242  QStringList subdevs; 
    43   if(node.isEmpty()){ 
     43  //if(node.isEmpty()){ 
    4444    subdevs = devDir.entryList(devFilter, QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::System, QDir::NoSort); 
    45   }else{ 
    46     subdevs = devDir.entryList(QStringList(node+"*"), QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::System, QDir::NoSort); 
    47   } 
     45  //}else{ 
     46    //subdevs = devDir.entryList(QStringList(node+"*"), QDir::NoDotAndDotDot | QDir::NoSymLinks | QDir::System, QDir::NoSort); 
     47  //} 
    4848  //Clean up the list of children 
    4949  for(int i=0; i<subdevs.length(); i++){ 
    50     if( (subdevs[i] == node) || subdevs[i].isEmpty() ){ 
     50    if( (subdevs[i] == node) || subdevs[i].isEmpty() || !subdevs[i].startsWith(node) ){ 
    5151      subdevs.removeAt(i); 
    5252      i--; 
    5353    } 
    5454  } 
     55  qDebug() << "[DEBUG] " <<node << "Device Children:" << subdevs; 
    5556  return subdevs; 
    5657} 
  • src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/.kde4/share/config/kickoffrc

    r810de8e r67e0ce1  
    11[Favorites] 
    2 FavoriteURLs=/usr/local/share/applications/kde4/systemsettings.desktop,/usr/local/share/applications/kde4/dolphin.desktop,/usr/local/share/applications/kde4/konsole.desktop 
     2FavoriteURLs=/usr/local/share/applications/pccontrol.desktop,/usr/local/share/applications/softmanager.desktop,/usr/local/share/applications/kde4/systemsettings.desktop,/usr/local/share/applications/kde4/dolphin.desktop,/usr/local/share/applications/kde4/konsole.desktop 
Note: See TracChangeset for help on using the changeset viewer.