Changeset c72dd71


Ignore:
Timestamp:
08/05/13 06:43:15 (17 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, 9.2-release, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
9f211e3
Parents:
b208a42c (diff), a674c8d (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:
3 edited

Legend:

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

    r6e77702 rfd5dfb8  
    120120} 
    121121 
    122 void MountTray::addDevice(QString dev, QString label, QString type, QString filesys){ 
     122bool MountTray::addDevice(QString dev, QString label, QString type, QString filesys){ 
    123123  if(!dev.startsWith(DEVICEDIR)){ dev.prepend(DEVICEDIR); } 
    124124   
     
    126126  int tot=0; 
    127127  for(int i=0; i<deviceList.length(); i++){ 
    128     if( deviceList[i]->device == dev ){ return; } //already exists, do nothing 
     128    if( deviceList[i]->device == dev ){ return false; } //already exists, do nothing 
    129129    if( deviceList[i]->getDeviceName().startsWith(label) ){ tot++; } 
    130130  } 
     
    142142  //Update the menu 
    143143  updateMenu(); 
     144  return true; 
    144145} 
    145146 
     
    220221    if(good){ 
    221222      //Now create a new entry for this device 
    222       addDevice(nsd[i],dlabel,dtype,dfs);   
     223      bool added = addDevice(nsd[i],dlabel,dtype,dfs);   
    223224      //Show a message bubble 
    224       if(showPopup){ 
     225      if(showPopup && added){ //make sure this is not shown for previously added devices 
    225226        QString title = tr("New Device"); 
    226227        QString message = QString( tr("%1 can now be accessed")).arg(dlabel); 
  • src-qt4/pc-mounttray/mountTray.h

    r891636a rfd5dfb8  
    7474  void scanInitialDevices(); 
    7575  int findDeviceInList(QString); 
    76   void addDevice(QString,QString,QString,QString); 
     76  bool addDevice(QString,QString,QString,QString); 
    7777  void startupDevdProc(); 
    7878  void getInitialUsername(); 
  • build-files/conf/port-make.conf

    r6c2cb18 rb208a42c  
    9494 
    9595virtualbox_SET=VNC WEBSERVICE 
    96 nginx_SET=HTTP_FLV 
     96 
     97# Options requested by FreeNAS 
     98nginx_SET=HTTP_FLV HTTP_SSL PASSENGER 
     99redmine_SET=POSTGRESQL PASSENGER 
     100rubygem-passenger=NGINX 
     101rubygem-rails=FCGI PASSENGER 
     102rubygem-activerecord=PGSQL SQLITE3 
    97103 
    98104# Configuration for www/bigbluebutton 
Note: See TracChangeset for help on using the changeset viewer.