Changeset 6490

Show
Ignore:
Timestamp:
08/23/08 23:01:40 (3 months ago)
Author:
flynd
Message:

Don't overwrite icq server port setting with default value when opening settings dialog.

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/qt-gui/src/optionsdlg.cpp

    r6458 r6490  
    328328 
    329329  edtICQServer->setText(QString(mainwin->licqDaemon->ICQServer())); 
    330   spnICQServerPort->setValue(mainwin->licqDaemon->ICQServerPort()); 
    331330  chkFirewall->setChecked(mainwin->licqDaemon->Firewall()); 
    332331  chkTCPEnabled->setChecked(mainwin->licqDaemon->TCPEnabled()); 
    … …  
    356355  edtProxyLogin->setText(QString(mainwin->licqDaemon->ProxyLogin())); 
    357356  edtProxyPasswd->setText(QString(mainwin->licqDaemon->ProxyPasswd())); 
    358    
     357 
     358  // Set server port after chkProxyEnabled as it will trigger slot_useProxy 
     359  // which overwrites server port field. 
     360  spnICQServerPort->setValue(mainwin->licqDaemon->ICQServerPort()); 
     361 
    359362  chkReconnectAfterUinClash->setChecked(mainwin->licqDaemon->ReconnectAfterUinClash()); 
    360363 

  • trunk/qt4-gui/src/settings/network.cpp

    r6091 r6490  
    237237{ 
    238238  myIcqServerEdit->setText(QString(gLicqDaemon->ICQServer())); 
    239   myIcqServerPortSpin->setValue(gLicqDaemon->ICQServerPort()); 
    240239  myFirewallCheck->setChecked(gLicqDaemon->Firewall()); 
    241240  myTcpEnabledCheck->setChecked(gLicqDaemon->TCPEnabled()); 
    … …  
    265264  myProxyLoginEdit->setText(QString(gLicqDaemon->ProxyLogin())); 
    266265  myProxyPasswdEdit->setText(QString(gLicqDaemon->ProxyPasswd())); 
     266 
     267  // Set server port after myProxyEnabledCheck as it will trigger useProxyToggled 
     268  // which overwrites server port field. 
     269  myIcqServerPortSpin->setValue(gLicqDaemon->ICQServerPort()); 
    267270 
    268271  myReconnectAfterUinClashCheck->setChecked(gLicqDaemon->ReconnectAfterUinClash());