Merge pull request #190 from jose1711/fix_spelling

Fix spelling errors

10 files changed, 68 insertions, 68 deletions

diff --git a/NEWS b/NEWS
index 0ced74e..1b27196 100644
--- a/NEWS
+++ b/NEWS
@@ -267,8 +267,8 @@ Other
 =================
 - Local address book
 - Message waiting indication (MWI)
-  * Sollicted MWI as specified by RFC 3842
-  * Unsollicited MWI as implemented by Asterisk
+  * Solicited MWI as specified by RFC 3842
+  * Unsolicited MWI as implemented by Asterisk
 - Voice mail speed dial
 - Call transfer with consultation
   * This is a combination of a consultation call on the other line
diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp
index 6c447a8..2d4f10f 100644
--- a/src/gui/mphoneform.cpp
+++ b/src/gui/mphoneform.cpp
@@ -1115,7 +1115,7 @@ void MphoneForm::updateMwi()
 				toolTip.append(tr("Unknown"));
 			}
 		} else {
-			if ((*i)->get_mwi_sollicited()) {
+			if ((*i)->get_mwi_solicited()) {
 				if (mwi.get_status() == t_mwi::MWI_FAILED) {
 					toolTip.append(tr("Failure"));
 					mwi_failure = true;
@@ -1123,7 +1123,7 @@ void MphoneForm::updateMwi()
 					toolTip.append(tr("Unknown"));
 				}
 			} else {
-				// Unsollicited MWI				
+				// Unsolicited MWI				
 				if (mwi.get_status() == t_mwi::MWI_KNOWN) {
 					bool new_msgs;
 					QString status = getMWIStatus(mwi, new_msgs);
diff --git a/src/gui/userprofileform.cpp b/src/gui/userprofileform.cpp
index 9ed9209..d0a94f3 100644
--- a/src/gui/userprofileform.cpp
+++ b/src/gui/userprofileform.cpp
@@ -102,8 +102,8 @@
 #define colReplace		1
 
 // MWI type indices
-#define idxMWIUnsollicited	0
-#define idxMWISollicited	1
+#define idxMWIUnsolicited	0
+#define idxMWISolicited	1
 
 // SIP transport protocol indices
 #define idxSipTransportAuto	0
@@ -383,12 +383,12 @@ void UserProfileForm::populate()
 	
 	// VOICE MAIL
 	vmAddressLineEdit->setText(current_profile->get_mwi_vm_address().c_str());
-	if (current_profile->get_mwi_sollicited()) {
-        mwiTypeComboBox->setCurrentIndex(idxMWISollicited);
-		mwiSollicitedGroupBox->setEnabled(true);
+	if (current_profile->get_mwi_solicited()) {
+        mwiTypeComboBox->setCurrentIndex(idxMWISolicited);
+		mwiSolicitedGroupBox->setEnabled(true);
 	} else {
-        mwiTypeComboBox->setCurrentIndex(idxMWIUnsollicited);
-		mwiSollicitedGroupBox->setEnabled(false);
+        mwiTypeComboBox->setCurrentIndex(idxMWIUnsolicited);
+		mwiSolicitedGroupBox->setEnabled(false);
 	}
 	mwiUserLineEdit->setText(current_profile->get_mwi_user().c_str());
 	mwiServerLineEdit->setText(current_profile->
@@ -809,7 +809,7 @@ bool UserProfileForm::validateValues()
 	
 
 	// Validity check voice mail page
-    if (mwiTypeComboBox->currentIndex() == idxMWISollicited) {
+    if (mwiTypeComboBox->currentIndex() == idxMWISolicited) {
 		// Mailbox user name is mandatory
 		if (mwiUserLineEdit->text().isEmpty()) {
             categoryListBox->setCurrentRow(idxCatVoiceMail);
@@ -921,8 +921,8 @@ bool UserProfileForm::validateValues()
 		proxyLineEdit->clear();
 	}
 	
-	// Clear sollicited MWI settings if unsollicited MWI is used
-    if (mwiTypeComboBox->currentIndex() == idxMWIUnsollicited) {
+	// Clear solicited MWI settings if unsolicited MWI is used
+    if (mwiTypeComboBox->currentIndex() == idxMWIUnsolicited) {
 		t_user user_default;
 		mwiUserLineEdit->clear();
 		mwiServerLineEdit->clear();
@@ -1002,10 +1002,10 @@ bool UserProfileForm::validateValues()
     current_profile->set_mwi_vm_address(vmAddressLineEdit->text().toStdString());
 	
 	bool mustTriggerMWISubscribe = false;
-    bool mwiSollicited = (mwiTypeComboBox->currentIndex() == idxMWISollicited);
-	if (mwiSollicited) {
-		if (!current_profile->get_mwi_sollicited()) {
-			// Sollicited MWI now enabled. Subscribe after all MWI
+    bool mwiSolicited = (mwiTypeComboBox->currentIndex() == idxMWISolicited);
+	if (mwiSolicited) {
+		if (!current_profile->get_mwi_solicited()) {
+			// Solicited MWI now enabled. Subscribe after all MWI
 			// settings have been changed.
 			mustTriggerMWISubscribe = true;
 		} else {
@@ -1015,7 +1015,7 @@ bool UserProfileForm::validateValues()
                 t_url(s.toStdString()) != current_profile->get_mwi_server() ||
 			    mwiViaProxyCheckBox->isChecked() != current_profile->get_mwi_via_proxy())
 			{
-				// Sollicited MWI settings changed. Trigger unsubscribe
+				// Solicited MWI settings changed. Trigger unsubscribe
 				// of current MWI subscription.
 				emit mwiChangeUnsubscribe(current_profile);
 				
@@ -1024,14 +1024,14 @@ bool UserProfileForm::validateValues()
 			}
 		}
 	} else {
-		if (current_profile->get_mwi_sollicited()) {
-			// MWI type changes to unsollicited. Trigger unsubscribe of
+		if (current_profile->get_mwi_solicited()) {
+			// MWI type changes to unsolicited. Trigger unsubscribe of
 			// current MWI subscription.
 			emit mwiChangeUnsubscribe(current_profile);
 		}
 	}
 	
-	current_profile->set_mwi_sollicited(mwiSollicited);
+	current_profile->set_mwi_solicited(mwiSolicited);
     current_profile->set_mwi_user(mwiUserLineEdit->text().toStdString());
 	s = USER_SCHEME;
 	s.append(':').append(mwiServerLineEdit->text());
@@ -1521,8 +1521,8 @@ void UserProfileForm::testConversion() {
 }
 
 void UserProfileForm::changeMWIType(int idxMWIType) {
-	if (idxMWIType == idxMWISollicited) {
-		mwiSollicitedGroupBox->setEnabled(true);
+	if (idxMWIType == idxMWISolicited) {
+		mwiSolicitedGroupBox->setEnabled(true);
 		
 		// Set defaults
 		if (mwiUserLineEdit->text().isEmpty()) {
@@ -1533,7 +1533,7 @@ void UserProfileForm::changeMWIType(int idxMWIType) {
 			mwiViaProxyCheckBox->setChecked(useProxyCheckBox->isChecked());
 		}
 	} else {
-		mwiSollicitedGroupBox->setEnabled(false);
+		mwiSolicitedGroupBox->setEnabled(false);
 	}
 }
 
diff --git a/src/gui/userprofileform.ui b/src/gui/userprofileform.ui
index 4a11efa..ef2f900 100644
--- a/src/gui/userprofileform.ui
+++ b/src/gui/userprofileform.ui
@@ -2494,7 +2494,7 @@ This format is what most SIP phones use.
               <item row="1" column="0">
                <widget class="QCheckBox" name="extReplacesCheckBox">
                 <property name="whatsThis">
-                 <string>Indicates if the Replaces-extenstion is supported.</string>
+                 <string>Indicates if the Replaces-extension is supported.</string>
                 </property>
                 <property name="text">
                  <string>Replaces</string>
@@ -2585,7 +2585,7 @@ This format is what most SIP phones use.
               <item>
                <widget class="QCheckBox" name="referAorCheckBox">
                 <property name="whatsThis">
-                 <string>An attended call transfer should use the contact URI as a refer target. A contact URI may not be globally routable however. Alternatively the AoR (Address of Record) may be used. A disadvantage is that the AoR may route to multiple endpoints in case of forking whereas the contact URI routes to a single endoint.</string>
+                 <string>An attended call transfer should use the contact URI as a refer target. A contact URI may not be globally routable however. Alternatively the AoR (Address of Record) may be used. A disadvantage is that the AoR may route to multiple endpoints in case of forking whereas the contact URI routes to a single endpoint.</string>
                 </property>
                 <property name="text">
                  <string>Attended refer to AoR (Address of Record)</string>
@@ -3079,7 +3079,7 @@ When you choose this option you have to create static address mappings in your N
              <widget class="QTableWidget" name="conversionListView">
               <property name="whatsThis">
                <string>&lt;p&gt;
-Often the format of the telphone numbers you need to dial is different from the format of the telephone numbers stored in your address book, e.g. your numbers start with a +-symbol followed by a country code, but your provider expects '00' instead of the '+', or you are at the office and all your numbers need to be prefixed with a '9' to access an outside line. Here you can specify number format conversion using Perl style regular expressions and format strings.
+Often the format of the telephone numbers you need to dial is different from the format of the telephone numbers stored in your address book, e.g. your numbers start with a +-symbol followed by a country code, but your provider expects '00' instead of the '+', or you are at the office and all your numbers need to be prefixed with a '9' to access an outside line. Here you can specify number format conversion using Perl style regular expressions and format strings.
 &lt;/p&gt;
 &lt;p&gt;
 For each number you dial, Twinkle will try to find a match in the list of match expressions. For the first match it finds, the number will be replaced with the format string. If no match is found, the number stays unchanged.
@@ -4076,7 +4076,7 @@ The values of all SIP headers of the outgoing INVITE are passed in environment v
        <item>
         <widget class="QCheckBox" name="zrtpEnabledCheckBox">
          <property name="whatsThis">
-          <string>When ZRTP/SRTP is enabled, then Twinkle will try to encrypt the audio of each call you originate or receive. Encryption will only succeed if the remote party has ZRTP/SRTP support enabled. If the remote party does not support ZRTP/SRTP, then the audio channel will stay unecrypted.</string>
+          <string>When ZRTP/SRTP is enabled, then Twinkle will try to encrypt the audio of each call you originate or receive. Encryption will only succeed if the remote party has ZRTP/SRTP support enabled. If the remote party does not support ZRTP/SRTP, then the audio channel will stay unencrypted.</string>
          </property>
          <property name="text">
           <string>&amp;Enable ZRTP/SRTP encryption</string>
@@ -4206,23 +4206,23 @@ The values of all SIP headers of the outgoing INVITE are passed in environment v
 &lt;p&gt;
 If your provider offers the message waiting indication service, then Twinkle can show you when new voice mail messages are waiting. Ask your provider which type of message waiting indication is offered.
 &lt;/p&gt;
-&lt;H3&gt;Unsollicited&lt;/H3&gt;
+&lt;H3&gt;Unsolicited&lt;/H3&gt;
 &lt;p&gt;
-Asterisk provides unsollicited message waiting indication.
+Asterisk provides unsolicited message waiting indication.
 &lt;/p&gt;
-&lt;H3&gt;Sollicited&lt;/H3&gt;
+&lt;H3&gt;Solicited&lt;/H3&gt;
 &lt;p&gt;
-Sollicited message waiting indication as specified by RFC 3842.
+Solicited message waiting indication as specified by RFC 3842.
 &lt;/p&gt;</string>
              </property>
              <item>
               <property name="text">
-               <string>Unsollicited</string>
+               <string>Unsolicited</string>
               </property>
              </item>
              <item>
               <property name="text">
-               <string>Sollicited</string>
+               <string>Solicited</string>
               </property>
              </item>
             </widget>
@@ -4261,9 +4261,9 @@ Sollicited message waiting indication as specified by RFC 3842.
         </layout>
        </item>
        <item>
-        <widget class="QGroupBox" name="mwiSollicitedGroupBox">
+        <widget class="QGroupBox" name="mwiSolicitedGroupBox">
          <property name="title">
-          <string>Sollicited MWI</string>
+          <string>Solicited MWI</string>
          </property>
          <layout class="QVBoxLayout">
           <item>
@@ -4328,7 +4328,7 @@ Sollicited message waiting indication as specified by RFC 3842.
                  </size>
                 </property>
                 <property name="whatsThis">
-                 <string>For sollicited MWI, an endpoint subscribes to the message status for a limited duration. Just before the duration expires, the endpoint should refresh the subscription.</string>
+                 <string>For solicited MWI, an endpoint subscribes to the message status for a limited duration. Just before the duration expires, the endpoint should refresh the subscription.</string>
                 </property>
                 <property name="maximum">
                  <number>999999</number>
diff --git a/src/parser/request.cpp b/src/parser/request.cpp
index e20a8fb..a157a94 100644
--- a/src/parser/request.cpp
+++ b/src/parser/request.cpp
@@ -505,9 +505,9 @@ bool t_request::is_valid(bool &fatal, std::string &reason) const {
 		
 		// RFC 3265 7.2
 		// Subscription-State header is mandatory
-		// As an exception Twinkle allows an unsollicited NOTIFY for MWI
+		// As an exception Twinkle allows an unsolicited NOTIFY for MWI
 		// without a Subscription-State header. Asterisk sends
-		// unsollicited NOTIFY requests.
+		// unsolicited NOTIFY requests.
 		if (!hdr_to.tag.empty() || 
 		    hdr_event.event_type != SIP_EVENT_MSG_SUMMARY)
 		{
@@ -519,7 +519,7 @@ bool t_request::is_valid(bool &fatal, std::string &reason) const {
 
 		// The Subscription-State header is mandatory.
 		// However, Asterisk uses an expired draft for sending
-		// unsollicitied NOTIFY messages without a Subscription-State
+		// unsolicitied NOTIFY messages without a Subscription-State
 		// header. As Asterisk is popular, Twinkle allows this.
 		break;
 	case REFER:
diff --git a/src/phone.cpp b/src/phone.cpp
index 16abc38..66d6ea0 100644
--- a/src/phone.cpp
+++ b/src/phone.cpp
@@ -3322,7 +3322,7 @@ void t_phone::init(void) {
 
 void t_phone::init_extensions(t_user *user_config) {
 	// Subscribe to MWI
-	if (user_config->get_mwi_sollicited()) {
+	if (user_config->get_mwi_solicited()) {
 		pub_subscribe_mwi(user_config);
 	}
 	
diff --git a/src/phone_user.cpp b/src/phone_user.cpp
index c52f396..5cac223 100644
--- a/src/phone_user.cpp
+++ b/src/phone_user.cpp
@@ -769,10 +769,10 @@ void t_phone_user::handle_response_register(t_response *r, bool &re_register) {
 			phone->start_timer(PTMR_TCP_PING, this);
 		}
 		
-		// Registration succeeded. If sollicited MWI is provisioned
+		// Registration succeeded. If solicited MWI is provisioned
 		// and no MWI subscription is established yet, then subscribe
 		// to MWI.
-		if (user_config->get_mwi_sollicited() && !mwi_auto_resubscribe) {
+		if (user_config->get_mwi_solicited() && !mwi_auto_resubscribe) {
 			subscribe_mwi();
 		}
 		
@@ -978,9 +978,9 @@ bool t_phone_user::is_mwi_terminated(void) const {
 	return mwi_dialog == NULL;
 }
 
-void t_phone_user::handle_mwi_unsollicited(t_request *r, t_tid tid) {
-	if (user_config->get_mwi_sollicited()) {
-		// Unsollicited MWI is not supported
+void t_phone_user::handle_mwi_unsolicited(t_request *r, t_tid tid) {
+	if (user_config->get_mwi_solicited()) {
+		// Unsolicited MWI is not supported
 		t_response *resp = r->create_response(R_403_FORBIDDEN);
 		phone->send_response(resp, 0, tid);
 		MEMMAN_DELETE(resp);
@@ -1186,13 +1186,13 @@ void t_phone_user::recvd_notify(t_request *r, t_tid tid) {
 	bool partial_match = false;
 	
 	if (r->hdr_to.tag.empty()) {
-		// Unsollicited NOTIFY
-		handle_mwi_unsollicited(r, tid);
+		// Unsolicited NOTIFY
+		handle_mwi_unsolicited(r, tid);
 		return;
 	}
 	
 	if (mwi_dialog && mwi_dialog->match_request(r, partial_match)) {
-		// Sollicited NOTIFY
+		// Solicited NOTIFY
 		mwi_dialog->recvd_request(r, 0, tid);
 		cleanup_mwi_dialog();
 		return;
diff --git a/src/phone_user.h b/src/phone_user.h
index 6e76ec8..50f86d6 100644
--- a/src/phone_user.h
+++ b/src/phone_user.h
@@ -280,11 +280,11 @@ public:
 	bool is_mwi_terminated(void) const;
 	
 	/**
-	 * Process an unsollicited NOTIFY for MWI.
+	 * Process an unsolicited NOTIFY for MWI.
 	 * @param r [in] The NOTIFY request.
 	 * @param tid [in] Transaction identifier of the NOTIFY transaction.
 	 */
-	void handle_mwi_unsollicited(t_request *r, t_tid tid);
+	void handle_mwi_unsolicited(t_request *r, t_tid tid);
 	//@}
 	
 	/** @name Presence */
diff --git a/src/user.cpp b/src/user.cpp
index 588bb55..16a4c3b 100644
--- a/src/user.cpp
+++ b/src/user.cpp
@@ -163,7 +163,7 @@ extern t_phone		*phone;
 #define FLD_ZRTP_SEND_IF_SUPPORTED	"zrtp_send_if_supported"
 
 // MWI
-#define FLD_MWI_SOLLICITED		"mwi_sollicited"
+#define FLD_MWI_SOLICITED		"mwi_solicited"
 #define FLD_MWI_USER			"mwi_user"
 #define FLD_MWI_SERVER			"mwi_server"
 #define FLD_MWI_VIA_PROXY		"mwi_via_proxy"
@@ -459,7 +459,7 @@ t_user::t_user() {
 	zrtp_goclear_warning = true;
 	zrtp_sdp = true;
 	zrtp_send_if_supported = false;
-	mwi_sollicited = false;
+	mwi_solicited = false;
 	mwi_user.clear();
 	mwi_via_proxy = false;
 	mwi_subscription_time = 3600;
@@ -578,7 +578,7 @@ t_user::t_user(const t_user &u) {
 	zrtp_goclear_warning = u.zrtp_goclear_warning;
 	zrtp_sdp = u.zrtp_sdp;
 	zrtp_send_if_supported = u.zrtp_send_if_supported;
-	mwi_sollicited = u.mwi_sollicited;
+	mwi_solicited = u.mwi_solicited;
 	mwi_user = u.mwi_user;
 	mwi_server = u.mwi_server;
 	mwi_via_proxy = u.mwi_via_proxy;
@@ -1380,10 +1380,10 @@ bool t_user::get_zrtp_send_if_supported(void) const {
 	return result;
 }
 
-bool t_user::get_mwi_sollicited(void) const {
+bool t_user::get_mwi_solicited(void) const {
 	bool result;
 	mtx_user.lock();
-	result = mwi_sollicited;
+	result = mwi_solicited;
 	mtx_user.unlock();
 	return result;
 }
@@ -2070,9 +2070,9 @@ void t_user::set_zrtp_send_if_supported(bool b) {
 	mtx_user.unlock();
 }
 
-void t_user::set_mwi_sollicited(bool b) {
+void t_user::set_mwi_solicited(bool b) {
 	mtx_user.lock();
-	mwi_sollicited = b;
+	mwi_solicited = b;
 	mtx_user.unlock();
 }
 
@@ -2524,8 +2524,8 @@ bool t_user::read_config(const string &filename, string &error_msg) {
 			zrtp_sdp = yesno2bool(value);
 		} else if (parameter == FLD_ZRTP_SEND_IF_SUPPORTED) {
 			zrtp_send_if_supported = yesno2bool(value);
-		} else if (parameter == FLD_MWI_SOLLICITED) {
-			mwi_sollicited = yesno2bool(value);
+		} else if (parameter == FLD_MWI_SOLICITED) {
+			mwi_solicited = yesno2bool(value);
 		} else if (parameter == FLD_MWI_USER) {
 			mwi_user = value;
 		} else if (parameter == FLD_MWI_SERVER) {
@@ -2869,7 +2869,7 @@ bool t_user::write_config(const string &filename, string &error_msg) {
 	
 	// Write MWI settings
 	config << "# MWI\n";
-	config << FLD_MWI_SOLLICITED << '=' << bool2yesno(mwi_sollicited) << endl;
+	config << FLD_MWI_SOLICITED << '=' << bool2yesno(mwi_solicited) << endl;
 	config << FLD_MWI_USER << '=' << mwi_user << endl;
 	if (mwi_server.is_valid()) {
 		config << FLD_MWI_SERVER << '=' << mwi_server.encode_noscheme() << endl;
diff --git a/src/user.h b/src/user.h
index 93921c4..bbd33fa 100644
--- a/src/user.h
+++ b/src/user.h
@@ -487,10 +487,10 @@ private:
 	bool		zrtp_send_if_supported;
 	
 	// MWI
-	// Indicate if MWI is sollicited or unsollicited.
-	// RFC 3842 specifies that MWI must be sollicited (SUBSCRIBE).
-	// Asterisk however only supported non-standard unsollicited MWI.
-	bool		mwi_sollicited;
+	// Indicate if MWI is solicited or unsolicited.
+	// RFC 3842 specifies that MWI must be solicited (SUBSCRIBE).
+	// Asterisk however only supported non-standard unsolicited MWI.
+	bool		mwi_solicited;
 	
 	// User name for subscribing to the mailbox
 	string		mwi_user;
@@ -659,7 +659,7 @@ public:
 	bool get_zrtp_goclear_warning(void) const;
 	bool get_zrtp_sdp(void) const;
 	bool get_zrtp_send_if_supported(void) const;
-	bool get_mwi_sollicited(void) const;
+	bool get_mwi_solicited(void) const;
 	string get_mwi_user(void) const;
 	t_url get_mwi_server(void) const;
 	bool get_mwi_via_proxy(void) const;
@@ -778,7 +778,7 @@ public:
 	void set_zrtp_goclear_warning(bool b);
 	void set_zrtp_sdp(bool b);
 	void set_zrtp_send_if_supported(bool b);
-	void set_mwi_sollicited(bool b);
+	void set_mwi_solicited(bool b);
 	void set_mwi_user(const string &user);
 	void set_mwi_server(const t_url &url);
 	void set_mwi_via_proxy(bool b);