Changeset 1b29242


Ignore:
Timestamp:
08/26/13 09:32:34 (14 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3
Children:
11b9eef
Parents:
22f21be
Message:

Switch the mount tray over to using "xdg-open" to open up the media directory, now that xdg-open has been fixed for KDE.

Location:
src-qt4/pc-mounttray
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-mounttray/mountTray.cpp

    r1a09105 r1b29242  
    2121  MTINIT=true; //set the flag that the mount tray is initializing; 
    2222  getInitialUsername(); //try to detect the non-root user who is running the program with root permissions 
    23   getDefaultFileManager(); //try to detect the default file-manager for opening the mount directory 
     23  //getDefaultFileManager(); //try to detect the default file-manager for opening the mount directory 
    2424  loadSavedSettings(); 
    2525   
     
    287287  if(DEBUG_MODE){ qDebug() << "-User detected:" << USERNAME; } 
    288288} 
    289  
     289/* 
    290290void MountTray::getDefaultFileManager(){ 
    291291  //Get the command to open the appropriate file manager 
     
    299299  if(DEBUG_MODE){ qDebug() << "-File manager detected:" << FILEMAN; } 
    300300} 
    301  
     301*/ 
    302302void MountTray::slotOpenMediaDir(){ 
    303303  openMediaDir(MOUNTDIR); 
     
    316316  //Open the default file manager to the given directory as that user 
    317317  qDebug() << "Opening the media directory with user permissions"; 
    318   QString cmd = "su -m "+USERNAME+" -c \'"+FILEMAN+" \""+dir+"\"\' &"; 
     318  QString cmd = "su -m "+USERNAME+" -c \'xdg-open \""+dir+"\"\' &"; 
    319319  if(DEBUG_MODE){ qDebug() << " -cmd:" << cmd; } 
    320320  system( cmd.toUtf8() );  
  • src-qt4/pc-mounttray/mountTray.h

    r1a09105 r1b29242  
    5959private: 
    6060  DevCheck *DCheck; 
    61   QString USERNAME, FILEMAN; 
     61  QString USERNAME;//, FILEMAN; 
    6262  QLocalSocket* devdProc; 
    6363  QTimer *devdTimer;   
     
    8181  void startupDevdProc(); 
    8282  void getInitialUsername(); 
    83   void getDefaultFileManager(); 
     83  //void getDefaultFileManager(); 
    8484  void loadSavedSettings(); 
    8585  void saveCurrentSettings(); 
Note: See TracChangeset for help on using the changeset viewer.