projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
client: Group SASL EXTERNAL under SASL, test cap
[quassel.git]
/
src
/
qtui
/
settingspages
/
networkssettingspage.h
diff --git
a/src/qtui/settingspages/networkssettingspage.h
b/src/qtui/settingspages/networkssettingspage.h
index
73bee52
..
d6614d9
100644
(file)
--- a/
src/qtui/settingspages/networkssettingspage.h
+++ b/
src/qtui/settingspages/networkssettingspage.h
@@
-150,7
+150,8
@@
private:
// Status icons
QIcon infoIcon, successIcon, unavailableIcon, questionIcon;
// Status icons
QIcon infoIcon, successIcon, unavailableIcon, questionIcon;
- CapSupportStatus _saslStatusSelected; /// Status of SASL support for currently-selected network
+ CapSupportStatus _capSaslStatusSelected; ///< Status of SASL support for selected network
+ bool _capSaslStatusUsingExternal{false}; ///< Whether SASL support status is for SASL EXTERNAL
void reset();
bool testHasChanged();
void reset();
bool testHasChanged();
@@
-160,12
+161,20
@@
private:
void saveToNetworkInfo(NetworkInfo&);
IdentityId defaultIdentity() const;
void saveToNetworkInfo(NetworkInfo&);
IdentityId defaultIdentity() const;
+ /**
+ * Get whether or not the displayed network's identity has SSL certs associated with it
+ *
+ * @return True if the currently displayed network has SSL certs set, otherwise false
+ */
+ bool displayedNetworkHasCertId() const;
+
/**
* Update the SASL settings interface according to the given SASL state
*
/**
* Update the SASL settings interface according to the given SASL state
*
- * @param[in] saslStatus Current status of SASL support.
+ * @param saslStatus Current status of SASL support.
+ * @param usingSASLExternal If true, SASL support status is for SASL EXTERNAL, else SASL PLAIN
*/
*/
- void set
SASLStatus(const CapSupportStatus saslStatus
);
+ void set
CapSASLStatus(const CapSupportStatus saslStatus, bool usingSASLExternal = false
);
};
class NetworkAddDlg : public QDialog
};
class NetworkAddDlg : public QDialog