Permalink
Browse files

Remove all the commented out sections for the old file manager detect…

…ion routine.
  • Loading branch information...
1 parent 1b29242 commit 11b9eeff1e1627fc85ae750262418388168cfc69 Ken Moore committed Aug 26, 2013
Showing with 2 additions and 16 deletions.
  1. +1 −14 src-qt4/pc-mounttray/mountTray.cpp
  2. +1 −2 src-qt4/pc-mounttray/mountTray.h
@@ -20,7 +20,6 @@ void MountTray::programInit()
qDebug() << "pc-mounttray: starting up";
MTINIT=true; //set the flag that the mount tray is initializing;
getInitialUsername(); //try to detect the non-root user who is running the program with root permissions
- //getDefaultFileManager(); //try to detect the default file-manager for opening the mount directory
loadSavedSettings();
trayIcon = new QSystemTrayIcon(this);
@@ -286,19 +285,7 @@ void MountTray::getInitialUsername(){
USERNAME=username.simplified(); //set the global variable
if(DEBUG_MODE){ qDebug() << "-User detected:" << USERNAME; }
}
-/*
-void MountTray::getDefaultFileManager(){
- //Get the command to open the appropriate file manager
- QString fmcmd = pcbsd::Utils::runShellCommand("de-info -fileman").join(" ");
- //qDebug() << "de-info result:" << fmcmd;
- fmcmd = fmcmd.remove("%s").simplified();
- //qDebug() << "FM command found:" << fmcmd;
- if( fmcmd.isEmpty() || fmcmd.contains("File ") ){fmcmd= "openwith"; } //Default to the "openwith" command
-
- FILEMAN = fmcmd.simplified();
- if(DEBUG_MODE){ qDebug() << "-File manager detected:" << FILEMAN; }
-}
-*/
+
void MountTray::slotOpenMediaDir(){
openMediaDir(MOUNTDIR);
}
@@ -58,7 +58,7 @@ private slots:
private:
DevCheck *DCheck;
- QString USERNAME;//, FILEMAN;
+ QString USERNAME;
QLocalSocket* devdProc;
QTimer *devdTimer;
int numMount, numAvail;
@@ -80,7 +80,6 @@ private slots:
bool addDevice(QString,QString,QString,QString);
void startupDevdProc();
void getInitialUsername();
- //void getDefaultFileManager();
void loadSavedSettings();
void saveCurrentSettings();

0 comments on commit 11b9eef

Please sign in to comment.