Changeset 1601f91


Ignore:
Timestamp:
09/18/14 12:14:48 (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.1, releng/10.1.1, releng/10.1.2, releng/10.2
Children:
d139132
Parents:
4d7eaa5 (diff), c95b548 (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:
4 edited

Legend:

Unmodified
Added
Removed
  • src-sh/pbi-manager/pbi-manager

    ra5f3eb7 r359eb0f  
    11951195        fi 
    11961196        if [ -z "$PBI_SHORTDESC" ] ; then 
    1197                 PBI_SHORTDESC="`${PKG_CMD} rquery -U '%c' ${PBI_ORIGIN} | awk 1 ORS='<br>' | sed 's|*|-|g'`" 
     1197                PBI_SHORTDESC="`${PKG_CMD} rquery -U '%c' ${PBI_ORIGIN} | sed 's|^$|<br>|g' | tr '\n' ' ' | sed 's|*|-|g'`" 
    11981198        fi 
    11991199        if [ -z "$PBI_DESC" ] ; then 
    1200                 PBI_DESC="`${PKG_CMD} rquery -U '%e' ${PBI_ORIGIN} | awk 1 ORS='<br>' | sed 's|*|-|g'`" 
     1200                PBI_DESC="`${PKG_CMD} rquery -U '%e' ${PBI_ORIGIN} | sed 's|^$|<br>|g' | tr '\n' ' ' | sed 's|*|-|g'`" 
    12011201        fi 
    12021202 
  • src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/Desktop/appcafe.desktop

    r6db5502 rc95b548  
    33Comment[en_US]= 
    44Comment= 
    5 Exec=pc-su pc-softwaremanager 
     5Exec=pc-softwaremanager 
    66Icon=/usr/local/share/pcbsd/icons/appcafe.png 
    77StartupNotify=true 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.cpp

    rc5730b9 r4d7eaa5  
    715715            } 
    716716            if(!Devs[currentItem].startsWith("wlan") && (DevsType[currentItem]== "Wireless") ){ 
    717               popup->addAction( tr("Setup Access Point"), this, SLOT(slotSetupAP()) ); 
     717              if( checkValue("/etc/rc.conf","wlans_"+Devs[currentItem], "\"wlan0\"") && checkValue("/etc/rc.conf","create_args_wlan0","\"wlanmode hostap\"") ){ 
     718                //Already setup as an Access Point 
     719                popup->addAction( tr("Disable Access Point"), this, SLOT(slotDisableAP()) ); 
     720              }else{ 
     721                popup->addAction( tr("Setup Access Point"), this, SLOT(slotSetupAP()) ); 
     722              } 
    718723            } 
    719724            popup->addSeparator(); 
     
    746751    } 
    747752  }        
     753} 
     754 
     755void NetworkMan::slotDisableAP(){ 
     756  int currentItem = listNetDev->currentRow(); 
     757  if(currentItem != -1){ 
     758    NetworkInterface::disableWirelessAccessPoint(Devs[currentItem]); 
     759  }              
    748760} 
    749761 
  • src-qt4/pc-netmanager/src/NetworkManager/networkman.h

    rd0efb53 r4d7eaa5  
    3939    void slotDisableDevice(); 
    4040    void slotSetupAP(); 
     41    void slotDisableAP(); 
    4142    void slotEnableDevice(); 
    4243    void slotShowInfoConfig(); 
Note: See TracChangeset for help on using the changeset viewer.