Changeset 11b9eef


Ignore:
Timestamp:
Aug 26, 2013 9:35:44 AM (8 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1
Children:
da39501
Parents:
1b29242
Message:

Remove all the commented out sections for the old file manager detection routine.

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

Legend:

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

    r1b29242 r11b9eef  
    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 
    2423  loadSavedSettings(); 
    2524   
     
    287286  if(DEBUG_MODE){ qDebug() << "-User detected:" << USERNAME; } 
    288287} 
    289 /* 
    290 void MountTray::getDefaultFileManager(){ 
    291   //Get the command to open the appropriate file manager 
    292   QString fmcmd = pcbsd::Utils::runShellCommand("de-info -fileman").join(" "); 
    293   //qDebug() << "de-info result:" << fmcmd; 
    294   fmcmd = fmcmd.remove("%s").simplified(); 
    295   //qDebug() << "FM command found:" << fmcmd; 
    296   if( fmcmd.isEmpty() || fmcmd.contains("File ") ){fmcmd= "openwith"; } //Default to the "openwith" command 
    297  
    298   FILEMAN = fmcmd.simplified(); 
    299   if(DEBUG_MODE){ qDebug() << "-File manager detected:" << FILEMAN; } 
    300 } 
    301 */ 
     288 
    302289void MountTray::slotOpenMediaDir(){ 
    303290  openMediaDir(MOUNTDIR); 
  • src-qt4/pc-mounttray/mountTray.h

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