Changeset 5a2e630f


Ignore:
Timestamp:
Sep 12, 2013 12:37:12 PM (10 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2
Children:
aad2985, 74b4950
Parents:
1d6186b (diff), 5ea46879 (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/mountTray.cpp

    r11b9eef rb3ee7b3  
    303303  //Open the default file manager to the given directory as that user 
    304304  qDebug() << "Opening the media directory with user permissions"; 
    305   QString cmd = "su -m "+USERNAME+" -c \'xdg-open \""+dir+"\"\' &"; 
    306   if(DEBUG_MODE){ qDebug() << " -cmd:" << cmd; } 
    307   system( cmd.toUtf8() );  
     305  QString cmd = "su -m "+USERNAME+" -c \"xdg-open \'"+dir+"\' \""; 
     306  if(DEBUG_MODE){ qDebug() << " -cmd:" << cmd ; } 
     307  cmd.prepend("("); cmd.append(") &"); 
     308  system( cmd.toUtf8() ); 
    308309} 
    309310 
  • src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/sudoers

    r35c5dc4a r1d6186b  
    5050## configuration files and this may lead to privilege escalation! 
    5151Defaults env_keep += "HOME DESKTOP_SESSION KDE_SESSION_UID" 
     52## 
     53## ENV to keep so xdg-open works 
     54Defaults env_keep += "KDE_FULL_SESSION GNOME_DESKTOP_SESSION_ID DESKTOP_SESSION" 
    5255## 
    5356## X11 resource path settings 
Note: See TracChangeset for help on using the changeset viewer.