[Pkg-voip-commits] [twinkle] 02/06: Drop patches applied upstream
Peter Colberg
peter at colberg.org
Sat May 14 03:30:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
pc-guest pushed a commit to branch master
in repository twinkle.
commit 5ffc09dac4a7d8ab80e32bddc5107e9705d86cf2
Author: Peter Colberg <peter at colberg.org>
Date: Fri May 13 07:12:35 2016 -0400
Drop patches applied upstream
---
debian/patches/crash-fixes.patch | 115 ----
.../desktop-entry-contains-encoding-key.patch | 17 -
...cting-definition-of-socklen_t-on-gnu-hurd.patch | 20 -
.../fix-incoming-call-popup-repositioning.patch | 17 -
debian/patches/fix-ip-fields-in-nat-settings.patch | 644 ---------------------
debian/patches/fix-spelling.patch | 565 ------------------
...oryform-clear-rows-before-loading-history.patch | 18 -
debian/patches/historyform-disable-editing.patch | 19 -
.../historyform-fix-sorting-by-time-of-event.patch | 27 -
.../historyform-resize-columns-to-contents.patch | 23 -
...oryform-show-call-details-of-current-item.patch | 104 ----
...ryform-sort-entries-after-loading-history.patch | 27 -
debian/patches/include-linux-errqueue.patch | 26 -
debian/patches/libgsm.patch | 194 -------
debian/patches/series | 15 -
debian/patches/wizard-corrected-signal-name.patch | 18 -
16 files changed, 1849 deletions(-)
diff --git a/debian/patches/crash-fixes.patch b/debian/patches/crash-fixes.patch
deleted file mode 100644
index 8c1c9ab..0000000
--- a/debian/patches/crash-fixes.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Description: Crash fixes
- This patch backports commit a6fd43692d0bbcaf4d0e07c9fda023b4cd718a86.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/line.cpp
-+++ b/src/line.cpp
-@@ -39,6 +39,8 @@ t_call_info::t_call_info() {
- }
-
- void t_call_info::clear(void) {
-+ t_mutex_guard g(mutex);
-+
- from_uri.set_url("");
- from_display.clear();
- from_display_override.clear();
-@@ -56,6 +58,8 @@ void t_call_info::clear(void) {
- }
-
- string t_call_info::get_from_display_presentation(void) const {
-+ t_mutex_guard g(mutex);
-+
- if (from_display_override.empty()) {
- return from_display;
- } else {
-@@ -599,6 +603,7 @@ void t_line::invite(t_phone_user *pu, const t_url &to_uri, const string &to_disp
- phone_user = pu;
- t_user *user_config = pu->get_user_profile();
-
-+ call_info.mutex.lock();
- call_info.from_uri = create_user_uri(); // NOTE: hide_user is not set yet
- call_info.from_display = user_config->get_display(false);
- call_info.from_organization = user_config->get_organization();
-@@ -607,6 +612,7 @@ void t_line::invite(t_phone_user *pu, const t_url &to_uri, const string &to_disp
- call_info.to_organization.clear();
- call_info.subject = subject;
- call_info.hdr_referred_by = hdr_referred_by;
-+ call_info.mutex.unlock();
-
- try_to_encrypt = user_config->get_zrtp_enabled();
-
-@@ -1452,6 +1458,7 @@ void t_line::recvd_invite(t_phone_user *pu, t_request *r, t_tid tid, const strin
- user_config = phone_user->get_user_profile();
- user_defined_ringtone = ringtone;
-
-+ call_info.mutex.lock();
- call_info.from_uri = r->hdr_from.uri;
- call_info.from_display = r->hdr_from.display;
- call_info.from_display_override = r->hdr_from.display_override;
-@@ -1464,6 +1471,7 @@ void t_line::recvd_invite(t_phone_user *pu, t_request *r, t_tid tid, const strin
- call_info.to_display = r->hdr_to.display;
- call_info.to_organization.clear();
- call_info.subject = r->hdr_subject.subject;
-+ call_info.mutex.unlock();
-
- try_to_encrypt = user_config->get_zrtp_enabled();
-
-@@ -2120,6 +2128,7 @@ void t_line::retry_retrieve_succeeded(void) {
- }
-
- t_call_info t_line::get_call_info(void) const {
-+ t_mutex_guard g(call_info.mutex);
- return call_info;
- }
-
---- a/src/line.h
-+++ b/src/line.h
-@@ -44,6 +44,7 @@ class t_phone;
- // call state to the user.
- class t_call_info {
- public:
-+ mutable t_mutex mutex;
- t_url from_uri;
- string from_display;
-
---- a/src/phone.cpp
-+++ b/src/phone.cpp
-@@ -721,7 +721,6 @@ void t_phone::handle_response_out_of_dialog(StunMessage *r, t_tuid tuid) {
- }
-
- t_phone_user *t_phone::find_phone_user(const string &profile_name) const {
-- t_rwmutex_reader x(phone_users_mtx);
-
- for (list<t_phone_user *>::const_iterator i = phone_users.begin();
- i != phone_users.end(); ++i)
---- a/src/sys_settings.cpp
-+++ b/src/sys_settings.cpp
-@@ -195,10 +195,10 @@ t_win_geometry::t_win_geometry(const string &value) {
- vector<string> v = split(value, ',');
-
- if (v.size() == 4) {
-- x = atoi(v[0].c_str());
-- y = atoi(v[1].c_str());
-- width = atoi(v[2].c_str());
-- height = atoi(v[3].c_str());
-+ x = std::stoi(v[0]);
-+ y = std::stoi(v[1]);
-+ width = std::stoi(v[2]);
-+ height = std::stoi(v[3]);
- }
- }
-
-@@ -1126,8 +1126,8 @@ string t_sys_settings::get_product_date(void) const {
- vector<string> l = split(PRODUCT_DATE, ' ');
- assert(l.size() == 3);
- t.tm_mon = str2month_full(l[0]);
-- t.tm_mday = atoi(l[1].c_str());
-- t.tm_year = atoi(l[2].c_str()) - 1900;
-+ t.tm_mday = std::stoi(l[1]);
-+ t.tm_year = std::stoi(l[2]) - 1900;
-
- char buf[64];
- strftime(buf, 64, "%d %B %Y", &t);
diff --git a/debian/patches/desktop-entry-contains-encoding-key.patch b/debian/patches/desktop-entry-contains-encoding-key.patch
deleted file mode 100644
index ce03775..0000000
--- a/debian/patches/desktop-entry-contains-encoding-key.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Remove deprecated Encoding key from desktop file
- The Encoding key is deprecated and all strings must be encoded in UTF-8.
- .
- http://standards.freedesktop.org/desktop-entry-spec/1.0/apc.html
-Author: Mark Purcell <msp at debian.org>
-Forwarded: https://github.com/LubosD/twinkle/pull/37
-Last-Update: 2008-10-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/twinkle.desktop.in
-+++ b/twinkle.desktop.in
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Twinkle
- GenericName=A SIP softphone
- Comment=A SIP softphone
diff --git a/debian/patches/fix-conflicting-definition-of-socklen_t-on-gnu-hurd.patch b/debian/patches/fix-conflicting-definition-of-socklen_t-on-gnu-hurd.patch
deleted file mode 100644
index 30f07ad..0000000
--- a/debian/patches/fix-conflicting-definition-of-socklen_t-on-gnu-hurd.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix conflicting definition of socklen_t on GNU Hurd
- GNU Hurd and OS X both define __MACH__.
- .
- Test for __APPLE__ to differentiate between GNU Hurd and OS X.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/stun/udp.h
-+++ b/src/stun/udp.h
-@@ -2,7 +2,7 @@
- #define udp_h
-
-
--#ifdef __MACH__
-+#if defined(__APPLE__) && defined(__MACH__)
- typedef int socklen_t;
- #endif
-
diff --git a/debian/patches/fix-incoming-call-popup-repositioning.patch b/debian/patches/fix-incoming-call-popup-repositioning.patch
deleted file mode 100644
index 8abb72f..0000000
--- a/debian/patches/fix-incoming-call-popup-repositioning.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix incoming call popup repositioning
- This patch backports commit 4b58b18865122c87ce3f547a0c82b1188b3773a9.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/gui/incoming_call_popup.cpp
-+++ b/src/gui/incoming_call_popup.cpp
-@@ -13,6 +13,7 @@ IncomingCallPopup::IncomingCallPopup(QObject *parent) : QObject(parent)
- // Qt5 QQuickView: setFlags()
- m_view->setWindowFlags(Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::ToolTip);
-
-+ m_view->rootContext()->setContextProperty("viewerWidget", m_view);
- m_view->setSource(QUrl("qrc:/qml/incoming_call.qml"));
-
- // Place into the middle of the screen
diff --git a/debian/patches/fix-ip-fields-in-nat-settings.patch b/debian/patches/fix-ip-fields-in-nat-settings.patch
deleted file mode 100644
index 3bfbbb7..0000000
--- a/debian/patches/fix-ip-fields-in-nat-settings.patch
+++ /dev/null
@@ -1,644 +0,0 @@
-Description: Fix IP fields in NAT settings
- This patch backports commit 35bbe88dd0591e3b14b62b8f3bf5b141aeeb95b0.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/gui/userprofileform.ui
-+++ b/src/gui/userprofileform.ui
-@@ -6,8 +6,8 @@
- <rect>
- <x>0</x>
- <y>0</y>
-- <width>771</width>
-- <height>582</height>
-+ <width>777</width>
-+ <height>592</height>
- </rect>
- </property>
- <property name="windowTitle">
-@@ -294,7 +294,7 @@
- <item row="2" column="0">
- <widget class="QLabel" name="domainTextLabel">
- <property name="text">
-- <string>&Domain*:</string>
-+ <string>Do&main*:</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
-@@ -307,7 +307,7 @@
- <item row="3" column="0">
- <widget class="QLabel" name="organizationTextLabel">
- <property name="text">
-- <string>Or&ganization:</string>
-+ <string>Organi&zation:</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
-@@ -547,7 +547,7 @@ This field is mandatory.</string>
- <item row="1" column="0">
- <widget class="QLabel" name="expiryTextLabel">
- <property name="text">
-- <string>&Expiry:</string>
-+ <string>E&xpiry:</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
-@@ -2173,7 +2173,7 @@ Send DTMF out-of-band via a SIP INFO request.
- <item row="0" column="0">
- <widget class="QLabel" name="holdVariantTextLabel">
- <property name="text">
-- <string>Call &Hold variant:</string>
-+ <string>Call Hold &variant:</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
-@@ -2372,7 +2372,7 @@ This format is what most SIP phones use.
- <item row="2" column="0">
- <widget class="QLabel" name="maxRedirectTextLabel">
- <property name="text">
-- <string>Max re&directions:</string>
-+ <string>&Max redirections:</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
-@@ -2869,7 +2869,7 @@ When you choose this option you have to create static address mappings in your N
- <string>Choose this option when your SIP provider offers a STUN server for NAT traversal.</string>
- </property>
- <property name="text">
-- <string>Use &STUN (does not work for incoming TCP)</string>
-+ <string>Use STUN (does not wor&k for incoming TCP)</string>
- </property>
- <property name="shortcut">
- <string>Alt+S</string>
-@@ -2881,7 +2881,7 @@ When you choose this option you have to create static address mappings in your N
- <item>
- <widget class="QLabel" name="stunServerTextLabel">
- <property name="text">
-- <string>S&TUN server:</string>
-+ <string>STUN ser&ver:</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
-@@ -4823,8 +4823,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>showCategory(int)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>31</x>
-+ <y>63</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -4839,8 +4839,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>126</x>
-+ <y>576</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -4855,8 +4855,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>validate()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>39</x>
-+ <y>576</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -4871,12 +4871,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>240</x>
-+ <y>329</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>240</x>
-+ <y>357</y>
- </hint>
- </hints>
- </connection>
-@@ -4887,12 +4887,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>240</x>
-+ <y>329</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>353</x>
-+ <y>357</y>
- </hint>
- </hints>
- </connection>
-@@ -4903,12 +4903,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>240</x>
-+ <y>329</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>240</x>
-+ <y>387</y>
- </hint>
- </hints>
- </connection>
-@@ -4919,12 +4919,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>456</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>484</y>
- </hint>
- </hints>
- </connection>
-@@ -4935,12 +4935,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>456</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>512</y>
- </hint>
- </hints>
- </connection>
-@@ -4951,12 +4951,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>456</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>358</x>
-+ <y>512</y>
- </hint>
- </hints>
- </connection>
-@@ -4967,12 +4967,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>240</x>
-+ <y>329</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>240</x>
-+ <y>415</y>
- </hint>
- </hints>
- </connection>
-@@ -4983,12 +4983,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>178</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>174</y>
- </hint>
- </hints>
- </connection>
-@@ -4999,12 +4999,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>178</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>170</y>
- </hint>
- </hints>
- </connection>
-@@ -5015,8 +5015,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>changeProfile(QString)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>116</x>
-+ <y>32</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5031,8 +5031,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>chooseRingtone()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>281</x>
-+ <y>60</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5047,8 +5047,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>chooseRingback()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>281</x>
-+ <y>64</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5063,8 +5063,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>chooseIncomingCallScript()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>281</x>
-+ <y>60</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5079,8 +5079,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>addCodec()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>451</x>
-+ <y>266</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5095,8 +5095,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>removeCodec()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>451</x>
-+ <y>300</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5111,8 +5111,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>upCodec()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>702</x>
-+ <y>266</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5127,8 +5127,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>downCodec()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>702</x>
-+ <y>300</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5143,8 +5143,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>addCodec()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>243</x>
-+ <y>211</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5159,8 +5159,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>removeCodec()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>493</x>
-+ <y>211</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5175,8 +5175,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>chooseInCallAnsweredScript()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>281</x>
-+ <y>62</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5191,8 +5191,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>chooseInCallFailedScript()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>281</x>
-+ <y>63</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5207,8 +5207,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>chooseLocalReleaseScript()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>281</x>
-+ <y>68</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5223,8 +5223,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>chooseOutCallAnsweredScript()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>281</x>
-+ <y>66</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5239,8 +5239,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>chooseOutCallFailedScript()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>281</x>
-+ <y>67</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5255,8 +5255,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>chooseOutgoingCallScript()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>281</x>
-+ <y>64</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5271,8 +5271,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>chooseRemoteReleaseScript()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>281</x>
-+ <y>70</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5287,8 +5287,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>upConversion()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>266</x>
-+ <y>101</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5303,8 +5303,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>downConversion()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>266</x>
-+ <y>103</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5319,8 +5319,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>addConversion()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>228</x>
-+ <y>89</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5335,8 +5335,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>editConversion()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>260</x>
-+ <y>89</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5351,8 +5351,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>removeConversion()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>244</x>
-+ <y>89</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5367,8 +5367,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>testConversion()</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>267</x>
-+ <y>80</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5383,12 +5383,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>225</x>
-+ <y>58</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>225</x>
-+ <y>62</y>
- </hint>
- </hints>
- </connection>
-@@ -5399,8 +5399,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>changeMWIType(int)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>269</x>
-+ <y>64</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5415,12 +5415,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>241</x>
-+ <y>251</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>447</x>
-+ <y>250</y>
- </hint>
- </hints>
- </connection>
-@@ -5431,8 +5431,8 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>changeSipTransportProtocol(int)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>368</x>
-+ <y>158</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
-@@ -5447,12 +5447,12 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>179</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>258</x>
-+ <y>179</y>
- </hint>
- </hints>
- </connection>
-@@ -5463,12 +5463,44 @@ Sollicited message waiting indication as specified by RFC 3842.
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>242</x>
-+ <y>179</y>
- </hint>
- <hint type="destinationlabel">
-- <x>20</x>
-- <y>20</y>
-+ <x>274</x>
-+ <y>179</y>
-+ </hint>
-+ </hints>
-+ </connection>
-+ <connection>
-+ <sender>natStunRadioButton</sender>
-+ <signal>toggled(bool)</signal>
-+ <receiver>stunServerLineEdit</receiver>
-+ <slot>setEnabled(bool)</slot>
-+ <hints>
-+ <hint type="sourcelabel">
-+ <x>418</x>
-+ <y>351</y>
-+ </hint>
-+ <hint type="destinationlabel">
-+ <x>431</x>
-+ <y>374</y>
-+ </hint>
-+ </hints>
-+ </connection>
-+ <connection>
-+ <sender>natStaticRadioButton</sender>
-+ <signal>toggled(bool)</signal>
-+ <receiver>publicIPLineEdit</receiver>
-+ <slot>setEnabled(bool)</slot>
-+ <hints>
-+ <hint type="sourcelabel">
-+ <x>334</x>
-+ <y>285</y>
-+ </hint>
-+ <hint type="destinationlabel">
-+ <x>437</x>
-+ <y>312</y>
- </hint>
- </hints>
- </connection>
diff --git a/debian/patches/fix-spelling.patch b/debian/patches/fix-spelling.patch
deleted file mode 100644
index d20d9b8..0000000
--- a/debian/patches/fix-spelling.patch
+++ /dev/null
@@ -1,565 +0,0 @@
-Description: Fix spelling mistakes detected by lintian
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: https://github.com/LubosD/twinkle/pull/43
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/NEWS
-+++ b/NEWS
-@@ -653,7 +653,7 @@ Build improvements
- - Fixed several build problams with KDE include files and
- libraries.
-
--If you already succesfully installed release 0.3.1 then there is
-+If you already successfully installed release 0.3.1 then there is
- no need to upgrade to 0.3.2 as there is no new functionality.
-
- 16 oct 2005 - Release 0.3.1
---- a/src/abstract_dialog.h
-+++ b/src/abstract_dialog.h
-@@ -144,7 +144,7 @@ protected:
- *
- * @param cr [in] The request.
- * @param resp [in] The failure response that was received on the request.
-- * @param contact [out] Contains on succesful return the contact to which the request is sent.
-+ * @param contact [out] Contains on successful return the contact to which the request is sent.
- * @return true, if the request is sent to a next destination.
- * @return false, if no next destination exists.
- */
---- a/src/address_book.h
-+++ b/src/address_book.h
-@@ -89,7 +89,7 @@ public:
-
- /**
- * Delete an address.
-- * @return true, if the address was succesfully deleted.
-+ * @return true, if the address was successfully deleted.
- * @return false, if the address does not exist.
- */
- bool del_address(const t_address_card &address);
---- a/src/auth.h
-+++ b/src/auth.h
-@@ -129,7 +129,7 @@ public:
- * @param resp [in] The response containing the challenge.
- * @return true, if authorization succeeds.
- * @return false, if authorization fails.
-- * @post On succesful authorization, the credentials has been added to
-+ * @post On successful authorization, the credentials has been added to
- * the request in the proper header (Authorization or Proxy-Authorization).
- */
- bool authorize(t_user *user_config, t_request *r, t_response *resp);
---- a/src/dialog.h
-+++ b/src/dialog.h
-@@ -597,7 +597,7 @@ public:
- /**
- * Redirect INVITE to the next destination.
- * @param resp The response on the INVITE.
-- * @return true, if INIVTE was redirected succesfully.
-+ * @return true, if INIVTE was redirected successfully.
- * @return false, if there is no next destination.
- *
- * @pre The response must be a 3XX.
-@@ -606,7 +606,7 @@ public:
-
- /**
- * Failover INVITE to the next destination from DNS lookup.
-- * @return true, if INIVTE was succesfully sent.
-+ * @return true, if INIVTE was successfully sent.
- * @return false, if there is no next destination.
- */
- bool failover_invite(void);
---- a/src/gui/gui.cpp
-+++ b/src/gui/gui.cpp
-@@ -1963,7 +1963,7 @@ void t_gui::cb_refer_result_success(int line) {
- QString s;
-
- emit mw_display_header();
-- s = qApp->translate("GUI", "Line %1: call succesfully transferred.").arg(line + 1);
-+ s = qApp->translate("GUI", "Line %1: call successfully transferred.").arg(line + 1);
- emit mw_display(s);
-
- // The refer state has changed, so update the main window.
---- a/src/gui/lang/twinkle_cs.ts
-+++ b/src/gui/lang/twinkle_cs.ts
-@@ -652,7 +652,7 @@
- <translation>Linka %1: přepojení hovoru selhalo.</translation>
- </message>
- <message>
-- <source>Line %1: call succesfully transferred.</source>
-+ <source>Line %1: call successfully transferred.</source>
- <translation>Linka %1: hovor byl přepojen.</translation>
- </message>
- <message>
-@@ -4465,7 +4465,7 @@ Systém VAD je vždy aktivován, pokud je nastaveno kódováni s VBR.</translati
- <translation>Ko&mplexita:</translation>
- </message>
- <message>
-- <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows to stop transmitting completely when the background noise is stationary.</source>
-+ <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows one to stop transmitting completely when the background noise is stationary.</source>
- <translation>Nesouvislé vysílání je rozšířením funkčnosi VAD/VBR, kdy je možné úplně přestat odesílat data v případě ticha.</translation>
- </message>
- <message>
-@@ -5522,7 +5522,7 @@ Pokud je deaktivováno, použije Twinkle první kodek z vlastního seznamu, kter
- </message>
- <message>
- <source><p>
--You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the ouput of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
-+You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the output of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
- </p>
- <p>
- <b>Note:</b> Twinkle pauses while your script runs. It is recommended that your script does not take more than 200 ms. When you need more time, you can send the parameters followed by <b>end</b> and keep on running. Twinkle will continue when it receives the <b>end</b> parameter.
---- a/src/gui/lang/twinkle_de.ts
-+++ b/src/gui/lang/twinkle_de.ts
-@@ -652,7 +652,7 @@
- <translation>Leitung %1: Rufweitervermittlung erfolglos.</translation>
- </message>
- <message>
-- <source>Line %1: call succesfully transferred.</source>
-+ <source>Line %1: call successfully transferred.</source>
- <translation>Leitung %1: Ruf wurde weitervermittelt.</translation>
- </message>
- <message>
-@@ -4500,7 +4500,7 @@ VBR (siehe dort) macht VAD unnötig.</translation>
- <translation type="obsolete">Alt+X</translation>
- </message>
- <message>
-- <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows to stop transmitting completely when the background noise is stationary.</source>
-+ <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows one to stop transmitting completely when the background noise is stationary.</source>
- <translation>Discontinuous transmission (deutsch etwa: nicht kontinuierliche Datenübertragung) ist eine Erweiterung der VAD/VBR-Übertragung. Bei gleichbleibenden Audiosignal (insbesondere bei erkannten Sprechpausen) wird statt ständig der gleichen Nutzdaten einfach gar nichts übertragen. Senkt die durchschnittliche Datenrate etwas. Bei Störungen auf dem Übertragungsweg kann diese Option zu den von Mobiltelefonen der Anfangszeit bekannten absurden Tonstörungen (hängenbleiben des [...]
- </message>
- <message>
-@@ -5571,7 +5571,7 @@ Alternativ kann Twinkle die AoR (Address of Record) nutzen. Nachteil hierbei: di
- </message>
- <message>
- <source><p>
--You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the ouput of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
-+You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the output of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
- </p>
- <p>
- <b>Note:</b> Twinkle pauses while your script runs. It is recommended that your script does not take more than 200 ms. When you need more time, you can send the parameters followed by <b>end</b> and keep on running. Twinkle will continue when it receives the <b>end</b> parameter.
---- a/src/gui/lang/twinkle_fr.ts
-+++ b/src/gui/lang/twinkle_fr.ts
-@@ -660,7 +660,7 @@
- <translation>Ligne %1: transfert d'appel échoué.</translation>
- </message>
- <message>
-- <source>Line %1: call succesfully transferred.</source>
-+ <source>Line %1: call successfully transferred.</source>
- <translation>Ligne %1: transfert d'appel réussi.</translation>
- </message>
- <message>
-@@ -4481,7 +4481,7 @@ Ce champ est obligatoire.</translation>
- <translation>Co&mplexité:</translation>
- </message>
- <message>
-- <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows to stop transmitting completely when the background noise is stationary.</source>
-+ <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows one to stop transmitting completely when the background noise is stationary.</source>
- <translation>La transmission discontinue est un ajout à VAD/VBR, qui permet d'arrêter totalement la transmission quand le bruit de fond est stationnaire.</translation>
- </message>
- <message>
-@@ -5536,7 +5536,7 @@ Si vous désactivez cette option, c'est le premier codec de la liste des co
- </message>
- <message>
- <source><p>
--You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the ouput of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
-+You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the output of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
- </p>
- <p>
- <b>Note:</b> Twinkle pauses while your script runs. It is recommended that your script does not take more than 200 ms. When you need more time, you can send the parameters followed by <b>end</b> and keep on running. Twinkle will continue when it receives the <b>end</b> parameter.
---- a/src/gui/lang/twinkle_nl.ts
-+++ b/src/gui/lang/twinkle_nl.ts
-@@ -756,7 +756,7 @@
- <translation>Lijn %1: doorverbinden gesprek mislukt.</translation>
- </message>
- <message>
-- <source>Line %1: call succesfully transferred.</source>
-+ <source>Line %1: call successfully transferred.</source>
- <translation>Lijn %1: doorverbinden gesprek geslaagd.</translation>
- </message>
- <message>
-@@ -4552,7 +4552,7 @@ Dit is een verplicht veld.</translation>
- <translation type="obsolete">Alt+X</translation>
- </message>
- <message>
-- <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows to stop transmitting completely when the background noise is stationary.</source>
-+ <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows one to stop transmitting completely when the background noise is stationary.</source>
- <translation>Discontinuous transmission (DTX) is een extra optie boven op VAD. Met DTX wordt helemaal niets gestuurd tijdens stilte periodes.</translation>
- </message>
- <message>
-@@ -5586,7 +5586,7 @@ Als u deze optie uitschakelt, dan neemt Twinkle de eerste codec uit de actieve c
- </message>
- <message>
- <source><p>
--You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the ouput of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
-+You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the output of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
- </p>
- <p>
- <b>Note:</b> Twinkle pauses while your script runs. It is recommended that your script does not take more than 200 ms. When you need more time, you can send the parameters followed by <b>end</b> and keep on running. Twinkle will continue when it receives the <b>end</b> parameter.
---- a/src/gui/lang/twinkle_ru.ts
-+++ b/src/gui/lang/twinkle_ru.ts
-@@ -672,7 +672,7 @@
- <translation>Линия %1: ошибка передачи звонка.</translation>
- </message>
- <message>
-- <source>Line %1: call succesfully transferred.</source>
-+ <source>Line %1: call successfully transferred.</source>
- <translation>Линия %1: Перевод звонка завершён.</translation>
- </message>
- <message>
-@@ -4429,7 +4429,7 @@ If you disable this option, then the first codec from the active codecs that is
- <translation type="unfinished"></translation>
- </message>
- <message>
-- <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows to stop transmitting completely when the background noise is stationary.</source>
-+ <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows one to stop transmitting completely when the background noise is stationary.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
-@@ -5134,7 +5134,7 @@ The values of all SIP headers of the incoming SIP BYE request are passed in envi
- </message>
- <message>
- <source><p>
--You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the ouput of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
-+You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the output of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
- </p>
- <p>
- <b>Note:</b> Twinkle pauses while your script runs. It is recommended that your script does not take more than 200 ms. When you need more time, you can send the parameters followed by <b>end</b> and keep on running. Twinkle will continue when it receives the <b>end</b> parameter.
---- a/src/gui/lang/twinkle_sv.ts
-+++ b/src/gui/lang/twinkle_sv.ts
-@@ -672,7 +672,7 @@
- <translation>Linje %1: samtalskoppling misslyckades.</translation>
- </message>
- <message>
-- <source>Line %1: call succesfully transferred.</source>
-+ <source>Line %1: call successfully transferred.</source>
- <translation>Linje %1: samtal kopplades.</translation>
- </message>
- <message>
-@@ -4429,7 +4429,7 @@ If you disable this option, then the first codec from the active codecs that is
- <translation type="obsolete">Alt+X</translation>
- </message>
- <message>
-- <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows to stop transmitting completely when the background noise is stationary.</source>
-+ <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows one to stop transmitting completely when the background noise is stationary.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
-@@ -5094,7 +5094,7 @@ The values of all SIP headers of the incoming SIP BYE request are passed in envi
- </message>
- <message>
- <source><p>
--You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the ouput of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
-+You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the output of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
- </p>
- <p>
- <b>Note:</b> Twinkle pauses while your script runs. It is recommended that your script does not take more than 200 ms. When you need more time, you can send the parameters followed by <b>end</b> and keep on running. Twinkle will continue when it receives the <b>end</b> parameter.
---- a/src/gui/lang/twinkle_xx.ts
-+++ b/src/gui/lang/twinkle_xx.ts
-@@ -653,7 +653,7 @@
- <translation type="unfinished"></translation>
- </message>
- <message>
-- <source>Line %1: call succesfully transferred.</source>
-+ <source>Line %1: call successfully transferred.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
-@@ -4197,7 +4197,7 @@ If you disable this option, then the first codec from the active codecs that is
- <translation type="unfinished"></translation>
- </message>
- <message>
-- <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows to stop transmitting completely when the background noise is stationary.</source>
-+ <source>Discontinuous transmission is an addition to VAD/VBR operation, that allows one to stop transmitting completely when the background noise is stationary.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
-@@ -4902,7 +4902,7 @@ The values of all SIP headers of the incoming SIP BYE request are passed in envi
- </message>
- <message>
- <source><p>
--You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the ouput of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
-+You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the output of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
- </p>
- <p>
- <b>Note:</b> Twinkle pauses while your script runs. It is recommended that your script does not take more than 200 ms. When you need more time, you can send the parameters followed by <b>end</b> and keep on running. Twinkle will continue when it receives the <b>end</b> parameter.
---- a/src/gui/main.cpp
-+++ b/src/gui/main.cpp
-@@ -268,7 +268,7 @@ void parse_main_args(int argc, char **argv, bool &cli_mode, bool &override_lock_
- cout << endl;
- cout << " --set-profile <profile>\n";
- cout << "\t\tMake <profile> the active profile.\n";
-- cout << "\t\tWhen using this option in conjuction with --call and --cmd,\n";
-+ cout << "\t\tWhen using this option in conjunction with --call and --cmd,\n";
- cout << "\t\tthen the profile is activated before executing --call or \n";
- cout << "\t\t--cmd.\n";
- cout << endl;
-@@ -277,7 +277,7 @@ void parse_main_args(int argc, char **argv, bool &cli_mode, bool &override_lock_
- cout << "\t\tand take focus.\n";
- cout << endl;
- cout << " --hide";
-- cout << "\t\tInstruct a running instance of Twinkle to hide in the sytem tray.\n";
-+ cout << "\t\tInstruct a running instance of Twinkle to hide in the system tray.\n";
- cout << "\t\tIf no system tray is used, then Twinkle will minimize.\n";
- cout << endl;
- cout << " --help-cli [cli command]\n";
-@@ -661,7 +661,7 @@ int main( int argc, char ** argv )
- // Activate a profile in the running Twinkle process.
- if (already_running && !g_cmd_args.cmd_set_profile.isEmpty()) {
- cmdsocket::cmd_cli(string("user ") + g_cmd_args.cmd_set_profile.toStdString(), true);
-- // Do not exit now as this option may be used in conjuction
-+ // Do not exit now as this option may be used in conjunction
- // with --call or --cmd
- must_exit = true;
- }
---- a/src/gui/mphoneform.cpp
-+++ b/src/gui/mphoneform.cpp
-@@ -971,7 +971,7 @@ void MphoneForm::updateRegStatus()
- toolTip.append("</b><br>");
- toolTip.append("<table>");
-
-- // Count number of succesful and failed registrations.
-+ // Count number of successful and failed registrations.
- // Determine tool tip showing registration details for all users.
- list<t_user *>user_list = phone->ref_users();
- for (list<t_user *>::iterator i = user_list.begin(); i != user_list.end(); i++) {
---- a/src/gui/userprofileform.ui
-+++ b/src/gui/userprofileform.ui
-@@ -1446,7 +1446,7 @@ If you disable this option, then the first codec from the active codecs that is
- <item row="1" column="0">
- <widget class="QCheckBox" name="spxDtxCheckBox">
- <property name="whatsThis">
-- <string>Discontinuous transmission is an addition to VAD/VBR operation, that allows to stop transmitting completely when the background noise is stationary.</string>
-+ <string>Discontinuous transmission is an addition to VAD/VBR operation, that allows one to stop transmitting completely when the background noise is stationary.</string>
- </property>
- <property name="text">
- <string>Discontinuous &Transmission</string>
-@@ -3748,7 +3748,7 @@ The values of all SIP headers of the incoming SIP BYE request are passed in envi
- <widget class="QLineEdit" name="incomingCallScriptLineEdit">
- <property name="whatsThis">
- <string><p>
--You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the ouput of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
-+You can customize the way Twinkle handles incoming calls. Twinkle can call a script when a call comes in. Based on the output of the script Twinkle accepts, rejects or redirects the call. When accepting the call, the ring tone can be customized by the script as well. The script can be any executable program.
- </p>
- <p>
- <b>Note:</b> Twinkle pauses while your script runs. It is recommended that your script does not take more than 200 ms. When you need more time, you can send the parameters followed by <b>end</b> and keep on running. Twinkle will continue when it receives the <b>end</b> parameter.
---- a/src/parser/hdr_warning.h
-+++ b/src/parser/hdr_warning.h
-@@ -43,14 +43,14 @@
- #define WARNING_300 "Incompatible network protocol"
- #define WARNING_301 "Incompatible network address formats"
- #define WARNING_302 "Incompatible transport protocol"
--#define WARNING_303 "Incompatible bandwith units"
-+#define WARNING_303 "Incompatible bandwidth units"
- #define WARNING_304 "Media type not available"
- #define WARNING_305 "Incompatible media format"
- #define WARNING_306 "Attribute not understood"
- #define WARNING_307 "Session description parameter not understood"
- #define WARNING_330 "Multicast not available"
- #define WARNING_331 "Unicast not available"
--#define WARNING_370 "Insufficient bandwith"
-+#define WARNING_370 "Insufficient bandwidth"
- #define WARNING_399 "Miscellanous warning"
-
- using namespace std;
---- a/src/parser/request.h
-+++ b/src/parser/request.h
-@@ -64,7 +64,7 @@ private:
- * @param passwd [in] Authentication password.
- * @param nc [in] Nonce count
- * @param cnonce [in] Client nonce
-- * @param cr [out] Credentials on succesful return.
-+ * @param cr [out] Credentials on successful return.
- * @param fail_reason [out] Failure reason on failure return.
- * @return false, if authorization fails.
- * @return true, if authorization succeeded
-@@ -82,7 +82,7 @@ private:
- * @param nc [in] Nonce count
- * @param cnonce [in] Client nonce
- * @param qop [in] Quality of protection
-- * @param resp [out] Response on succesful return.
-+ * @param resp [out] Response on successful return.
- * @param fail_reason [out] Failure reason on failure return.
- * @return false, if authorization fails.
- * @return true, if authorization succeeded
-@@ -102,7 +102,7 @@ private:
- * @param nc [in] Nonce count
- * @param cnonce [in] Client nonce
- * @param qop [in] Quality of protection
-- * @param resp [out] Response on succesful return.
-+ * @param resp [out] Response on successful return.
- * @param fail_reason [out] Failure reason on failure return.
- * @return false, if authorization fails.
- * @return true, if authorization succeeded
-@@ -174,7 +174,7 @@ public:
- * @param passwd [in] Authentication password.
- * @param nc [in] Nonce count
- * @param cnonce [in] Client nonce
-- * @param cr [out] Credentials on succesful return.
-+ * @param cr [out] Credentials on successful return.
- * @param fail_reason [out] Failure reason on failure return.
- * @return false, if challenge is not supported.
- * @return true, if authorization succeeded
-@@ -191,7 +191,7 @@ public:
- * @param passwd [in] Authentication password.
- * @param nc [in] Nonce count
- * @param cnonce [in] Client nonce
-- * @param cr [out] Credentials on succesful return.
-+ * @param cr [out] Credentials on successful return.
- * @param fail_reason [out] Failure reason on failure return.
- * @return false, if challenge is not supported.
- * @return true, if authorization succeeded
---- a/src/phone.h
-+++ b/src/phone.h
-@@ -551,7 +551,7 @@ public:
- * @return false, if there is already a phone user with the same name
- * and domain. In this case dup_user is a pointer to the user config
- * of that user.
-- * @return true, if the phone user was added succesfully.
-+ * @return true, if the phone user was added successfully.
- * @note if there is already a user with exactly the same user config
- * then true is returned, but the user is not added again. The user
- * will be activated if it was inactive though.
-@@ -685,7 +685,7 @@ public:
-
- /**
- * Set the signal handler to handler for LinuxThreads.
-- * @return True if succesful, false otherwise.
-+ * @return True if successful, false otherwise.
- */
- bool set_sighandler(void) const;
-
---- a/src/phone_user.h
-+++ b/src/phone_user.h
-@@ -449,7 +449,7 @@ public:
- * @param r [inout] The request to be authorized.
- * @param resp [in] The response containing the challenge (401/407).
- * @param True if authorization succeeds, false otherwise.
-- * @post On succesful return the request r contains the correct authorization
-+ * @post On successful return the request r contains the correct authorization
- * header (based on 401/407 response).
- */
- bool authorize(t_request *r, t_response *resp);
---- a/src/presence/buddy.h
-+++ b/src/presence/buddy.h
-@@ -188,7 +188,7 @@ public:
- void stop_resubscribe_presence_timer(void);
-
- /**
-- * By calling this method, succesful STUN completion is signalled to
-+ * By calling this method, successful STUN completion is signalled to
- * the buddy. It will subscribe to presence if it was waiting for STUN.
- */
- void stun_completed(void);
-@@ -302,7 +302,7 @@ public:
- bool match_timer(t_subscribe_timer timer, t_object_id id_timer, t_buddy **buddy);
-
- /**
-- * By calling this method, succesful STUN completion is signalled to the buddy
-+ * By calling this method, successful STUN completion is signalled to the buddy
- * list. The buddy list will now start presence subscriptions that were waiting
- * for STUN to complete.
- */
---- a/src/stun/stun.cxx
-+++ b/src/stun/stun.cxx
-@@ -1896,7 +1896,7 @@ stunSendTest( StunSocket myFd, StunAddress4& dest,
- discard=true;
- break;
- default:
-- cerr << "Test " << testNum <<" is unkown\n";
-+ cerr << "Test " << testNum <<" is unknown\n";
- assert(0);
- }
-
---- a/src/sub_refer.cpp
-+++ b/src/sub_refer.cpp
-@@ -263,7 +263,7 @@ bool t_sub_refer::recv_subscribe(t_request *r, t_tuid tuid, t_tid tid) {
- delete resp;
-
- // RFC 3265 3.2.2
-- // After a succesful SUBSCRIBE the notifier must immediately
-+ // After a successful SUBSCRIBE the notifier must immediately
- // send a NOTIFY.
- // If no last response has been kept then this is probably a
- // first SUBSCRIBE. The dialog has to send the initial NOTIFY.
---- a/src/subscription.cpp
-+++ b/src/subscription.cpp
-@@ -555,7 +555,7 @@ bool t_subscription::recv_subscribe_response(t_response *r, t_tuid tuid, t_tid t
-
- log_file->write_header("t_subscription::recv_subscribe_response",
- LOG_NORMAL, LOG_DEBUG);
-- log_file->write_raw("Unsubcription succesful.\n");
-+ log_file->write_raw("Unsubcription successful.\n");
- log_event();
- log_file->write_footer();
- } else {
---- a/src/subscription.h
-+++ b/src/subscription.h
-@@ -39,7 +39,7 @@ enum t_subscription_state {
- SS_NULL, /**< Initial state */
- SS_ESTABLISHED, /**< Subscription is in place */
- SS_UNSUBSCRIBING, /**< A request to unsubscribe has been sent */
-- SS_UNSUBSCRIBED, /**< An outoging unsubscribe was succesful. Waiting for the final NOTIFY. */
-+ SS_UNSUBSCRIBED, /**< An outoging unsubscribe was successful. Waiting for the final NOTIFY. */
- SS_TERMINATED, /**< Subscription ended */
- };
-
---- a/src/sys_settings.h
-+++ b/src/sys_settings.h
-@@ -499,7 +499,7 @@ public:
- * @param error_msg [out] Error message if the operation fails.
- * @param already_running [out] If the operation fails, this flag indicates Twinkle
- * is already running.
-- * @return True if the file is locked succesfully.
-+ * @return True if the file is locked successfully.
- * @return False if the file could not be locked.
- */
- bool create_lock_file(bool shared_lock, string &error_msg, bool &already_running);
---- a/src/userintf.cpp
-+++ b/src/userintf.cpp
-@@ -3063,7 +3063,7 @@ void t_userintf::cb_refer_result_success(int line) {
- if (line >= NUM_USER_LINES) return;
-
- cout << endl;
-- cout << "Line " << line + 1 << ": call succesfully referred.\n";
-+ cout << "Line " << line + 1 << ": call successfully referred.\n";
- cout << endl;
- cout.flush();
- }
---- a/src/utils/record_file.h
-+++ b/src/utils/record_file.h
-@@ -49,7 +49,7 @@ public:
- /**
- * Create a record to write to a file.
- * @param v [out] Vector of fields of record.
-- * @return true, if record is succesfully created.
-+ * @return true, if record is successfully created.
- * @return false, otherwise.
- */
- virtual bool create_file_record(vector<string> &v) const = 0;
-@@ -57,7 +57,7 @@ public:
- /**
- * Populate from a file record.
- * @param v [in] Vector containing the fields of the record.
-- * @return true, if record is succesfully populated.
-+ * @return true, if record is successfully populated.
- * @return false, if file record could not be parsed.
- */
- virtual bool populate_from_file_record(const vector<string> &v) = 0;
-@@ -132,7 +132,7 @@ public:
- /**
- * Load records from file.
- * @param error_msg [out] Error message on failure return.
-- * @return true, if file was read succesfully.
-+ * @return true, if file was read successfully.
- * @return false, if it fails. error_msg is an error to be given to
- * the user.
- */
-@@ -141,7 +141,7 @@ public:
- /**
- * Save records to file.
- * @param error_msg [out] Error message on failure return.
-- * @return true, if file was saved succesfully.
-+ * @return true, if file was saved successfully.
- * @return false, if it fails. error_msg is an error to be given to
- * the user.
- */
diff --git a/debian/patches/historyform-clear-rows-before-loading-history.patch b/debian/patches/historyform-clear-rows-before-loading-history.patch
deleted file mode 100644
index 7f4ab5b..0000000
--- a/debian/patches/historyform-clear-rows-before-loading-history.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: historyform: Clear rows before loading history
- This patch backports commit 07991f06fe7404708a66537ad87a2f42a8f71565.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/gui/historyform.cpp
-+++ b/src/gui/historyform.cpp
-@@ -125,6 +125,8 @@ void HistoryForm::loadHistory()
- unsigned long totalCallDuration = 0;
- unsigned long totalConversationDuration = 0;
-
-+ m_model->setRowCount(0);
-+
- std::list<t_call_record> history;
-
- call_history->get_history(history);
diff --git a/debian/patches/historyform-disable-editing.patch b/debian/patches/historyform-disable-editing.patch
deleted file mode 100644
index d30f945..0000000
--- a/debian/patches/historyform-disable-editing.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: historyform: Disable editing
- This patch backports commit 1943a35fbcab844d469e8129f78bf7ebe504aa42.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/gui/historyform.ui
-+++ b/src/gui/historyform.ui
-@@ -25,6 +25,9 @@
- <property name="selectionBehavior">
- <enum>QAbstractItemView::SelectRows</enum>
- </property>
-+ <property name="editTriggers">
-+ <enum>QAbstractItemView::NoEditTriggers</enum>
-+ </property>
- <property name="sortingEnabled">
- <bool>true</bool>
- </property>
diff --git a/debian/patches/historyform-fix-sorting-by-time-of-event.patch b/debian/patches/historyform-fix-sorting-by-time-of-event.patch
deleted file mode 100644
index d115579..0000000
--- a/debian/patches/historyform-fix-sorting-by-time-of-event.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: historyform: Fix sorting by time of event
- This patch backports commit a072b933032647cd2feca45adb4c11fa80410af6.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/gui/historyform.cpp
-+++ b/src/gui/historyform.cpp
-@@ -27,6 +27,7 @@
- #include "qicon.h"
- #include "audits/memman.h"
- #include "historyform.h"
-+#include <QDateTime>
-
- #define HISTCOL_TIMESTAMP 0
- #define HISTCOL_DIRECTION 1
-@@ -174,8 +175,7 @@ void HistoryForm::loadHistory()
- {
- case HISTCOL_TIMESTAMP:
- {
-- QString time = QString::fromStdString(time2str(cr->time_start, "%d %b %Y %H:%M:%S"));
-- m_model->setData(index, time);
-+ m_model->setData(index, QDateTime::fromTime_t(cr->time_start));
- break;
- }
- case HISTCOL_DIRECTION:
diff --git a/debian/patches/historyform-resize-columns-to-contents.patch b/debian/patches/historyform-resize-columns-to-contents.patch
deleted file mode 100644
index 30ebcd3..0000000
--- a/debian/patches/historyform-resize-columns-to-contents.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: historyform: Resize columns to contents
- This patch backports commit c0d7e4ae89989d9882152cca4e539dec01d23f13.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/gui/historyform.cpp
-+++ b/src/gui/historyform.cpp
-@@ -79,8 +79,11 @@ void HistoryForm::init()
- m_model->setHorizontalHeaderLabels(QStringList() << tr("Time") << tr("In/Out") << tr("From/To") << tr("Subject") << tr("Status"));
- historyListView->horizontalHeader()->setSortIndicator(HISTCOL_TIMESTAMP, Qt::DescendingOrder);
-
-- historyListView->setColumnWidth(HISTCOL_FROMTO, 200);
-- historyListView->setColumnWidth(HISTCOL_SUBJECT, 200);
-+#if QT_VERSION >= 0x050000
-+ historyListView->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
-+#else
-+ historyListView->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
-+#endif
-
- inCheckBox->setChecked(true);
- outCheckBox->setChecked(true);
diff --git a/debian/patches/historyform-show-call-details-of-current-item.patch b/debian/patches/historyform-show-call-details-of-current-item.patch
deleted file mode 100644
index 03b0bc6..0000000
--- a/debian/patches/historyform-show-call-details-of-current-item.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Description: historyform: Show call details of current item
- This patch backports commit f3926963ea687c6dbac3d6e3fdb832f81bddf903.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/gui/historyform.cpp
-+++ b/src/gui/historyform.cpp
-@@ -84,6 +84,8 @@ void HistoryForm::init()
- #else
- historyListView->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
- #endif
-+
-+ connect(historyListView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), SLOT(showCallDetails(QModelIndex)));
-
- inCheckBox->setChecked(true);
- outCheckBox->setChecked(true);
-@@ -236,9 +238,7 @@ void HistoryForm::loadHistory()
- // Sort entries using currently selected sort column and order.
- historyListView->sortByColumn(historyListView->horizontalHeader()->sortIndicatorSection(), historyListView->horizontalHeader()->sortIndicatorOrder());
- // Make the first entry the selected entry.
-- historyListView->selectRow(0);
--
-- // showCallDetails(first);
-+ if (numberOfCalls) historyListView->selectRow(0);
- }
-
- // Update history when triggered by a call back function on the user
-@@ -279,13 +279,14 @@ void HistoryForm::closeEvent( QCloseEvent *e )
- QDialog::closeEvent(e);
- }
-
--void HistoryForm::showCallDetails(QModelIndex index)
-+void HistoryForm::showCallDetails(const QModelIndex &index)
- {
-- QString s;
-+ cdrTextEdit->clear();
-+
-+ if (!index.isValid()) return;
-
- int x = m_model->data(index, Qt::UserRole).toInt();
- const t_call_record& cr = m_history[x];
-- cdrTextEdit->clear();
-
- t_user *user_config = phone->ref_user_profile(cr.user_profile);
- // If the user profile is not active, then use the
-@@ -294,7 +295,7 @@ void HistoryForm::showCallDetails(QModelIndex index)
- user_config = phone->ref_users().front();
- }
-
-- s = "<table>";
-+ QString s = "<table>";
-
- // Left column: header names
- s += "<tr><td><b>";
---- a/src/gui/historyform.h
-+++ b/src/gui/historyform.h
-@@ -20,7 +20,6 @@ public slots:
- virtual void update();
- virtual void show();
- virtual void closeEvent( QCloseEvent * e );
-- virtual void showCallDetails( QModelIndex item );
- virtual void popupMenu( QPoint pos );
- virtual void call( QModelIndex index );
- virtual void call( void );
-@@ -45,6 +44,8 @@ private:
- void init();
- void destroy();
-
-+private slots:
-+ void showCallDetails(const QModelIndex &);
- };
-
-
---- a/src/gui/historyform.ui
-+++ b/src/gui/historyform.ui
-@@ -445,26 +445,9 @@
- </hint>
- </hints>
- </connection>
-- <connection>
-- <sender>historyListView</sender>
-- <signal>activated(QModelIndex)</signal>
-- <receiver>HistoryForm</receiver>
-- <slot>showCallDetails(QModelIndex)</slot>
-- <hints>
-- <hint type="sourcelabel">
-- <x>743</x>
-- <y>238</y>
-- </hint>
-- <hint type="destinationlabel">
-- <x>658</x>
-- <y>300</y>
-- </hint>
-- </hints>
-- </connection>
- </connections>
- <slots>
- <slot>call(QModelIndex)</slot>
- <slot>popupMenu(QPoint)</slot>
-- <slot>showCallDetails(QModelIndex)</slot>
- </slots>
- </ui>
diff --git a/debian/patches/historyform-sort-entries-after-loading-history.patch b/debian/patches/historyform-sort-entries-after-loading-history.patch
deleted file mode 100644
index e33763c..0000000
--- a/debian/patches/historyform-sort-entries-after-loading-history.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: historyform: Sort entries after loading history data
- This patch backports commit 420f9b5fcffe2da63613ac8595a96831d952f5eb.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/gui/historyform.cpp
-+++ b/src/gui/historyform.cpp
-@@ -77,7 +77,7 @@ void HistoryForm::init()
- m_model->setColumnCount(5);
-
- m_model->setHorizontalHeaderLabels(QStringList() << tr("Time") << tr("In/Out") << tr("From/To") << tr("Subject") << tr("Status"));
-- historyListView->sortByColumn(HISTCOL_TIMESTAMP, Qt::DescendingOrder);
-+ historyListView->horizontalHeader()->setSortIndicator(HISTCOL_TIMESTAMP, Qt::DescendingOrder);
-
- historyListView->setColumnWidth(HISTCOL_FROMTO, 200);
- historyListView->setColumnWidth(HISTCOL_SUBJECT, 200);
-@@ -228,6 +228,8 @@ void HistoryForm::loadHistory()
- durationText += ")";
- totalDurationValueTextLabel->setText(durationText);
-
-+ // Sort entries using currently selected sort column and order.
-+ historyListView->sortByColumn(historyListView->horizontalHeader()->sortIndicatorSection(), historyListView->horizontalHeader()->sortIndicatorOrder());
- // Make the first entry the selected entry.
- historyListView->selectRow(0);
-
diff --git a/debian/patches/include-linux-errqueue.patch b/debian/patches/include-linux-errqueue.patch
deleted file mode 100644
index f639f74..0000000
--- a/debian/patches/include-linux-errqueue.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix detection of <linux/errqueue.h>
- Linux ≥ 3.17 requires the definition of `struct timespec`.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: https://github.com/LubosD/twinkle/pull/42
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -23,6 +23,7 @@ if (WITH_QT4 AND WITH_QT5)
- endif (WITH_QT4 AND WITH_QT5)
-
- include (CheckIncludeFile)
-+include (CheckIncludeFiles)
-
- find_package(LibXml2 REQUIRED)
- find_package(LibMagic REQUIRED)
-@@ -130,7 +131,7 @@ endif (WITH_G729)
-
- check_include_file(unistd.h HAVE_UNISTD_H)
- check_include_file(linux/types.h HAVE_LINUX_TYPES_H)
--check_include_file(linux/errqueue.h HAVE_LINUX_ERRQUEUE_H)
-+check_include_files("sys/socket.h;linux/errqueue.h" HAVE_LINUX_ERRQUEUE_H)
-
- set(datadir "${CMAKE_INSTALL_PREFIX}/share/twinkle")
- configure_file(twinkle_config.h.in twinkle_config.h)
diff --git a/debian/patches/libgsm.patch b/debian/patches/libgsm.patch
deleted file mode 100644
index 0c239c0..0000000
--- a/debian/patches/libgsm.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-Description: Build against packaged gsm library
- This patch adds a cmake option WITH_GSM that supports building
- twinkle against the packaged gsm library in Debian.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: https://github.com/LubosD/twinkle/pull/38
-Last-Update: 2015-12-28
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,6 +14,7 @@ OPTION(WITH_DIAMONDCARD "Enable Diamondcard integration" OFF)
- OPTION(WITH_QT4 "Enable Qt 4 GUI" OFF)
- OPTION(WITH_QT5 "Enable Qt 5 GUI" OFF)
- OPTION(WITH_G729 "Enable G.729A support" OFF)
-+OPTION(WITH_GSM "Use external GSM library" OFF)
-
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-
-@@ -114,6 +115,18 @@ if (WITH_G729)
- endif (G729_FOUND)
- endif (WITH_G729)
-
-+if (WITH_GSM)
-+ find_package(Gsm)
-+
-+ if (GSM_FOUND)
-+ message(STATUS "gsm OK")
-+ set(HAVE_GSM TRUE)
-+
-+ include_directories(${GSM_INCLUDE_DIR})
-+ else (GSM_FOUND)
-+ message(FATAL_ERROR "gsm not found!")
-+ endif (GSM_FOUND)
-+endif (WITH_GSM)
-
- check_include_file(unistd.h HAVE_UNISTD_H)
- check_include_file(linux/types.h HAVE_LINUX_TYPES_H)
-new file mode 100644
---- /dev/null
-+++ b/cmake/FindGsm.cmake
-@@ -0,0 +1,17 @@
-+FIND_PATH(GSM_INCLUDE_DIR gsm/gsm.h)
-+FIND_LIBRARY(GSM_LIBRARY NAMES gsm)
-+
-+IF(GSM_INCLUDE_DIR AND GSM_LIBRARY)
-+ SET(GSM_FOUND TRUE)
-+ENDIF(GSM_INCLUDE_DIR AND GSM_LIBRARY)
-+
-+IF(GSM_FOUND)
-+ IF (NOT Gsm_FIND_QUIETLY)
-+ MESSAGE(STATUS "Found gsm includes: ${GSM_INCLUDE_DIR}/gsm/config.h")
-+ MESSAGE(STATUS "Found gsm library: ${GSM_LIBRARY}")
-+ ENDIF (NOT Gsm_FIND_QUIETLY)
-+ELSE(GSM_FOUND)
-+ IF (Gsm_FIND_REQUIRED)
-+ MESSAGE(FATAL_ERROR "Could NOT find gsm development files")
-+ ENDIF (Gsm_FIND_REQUIRED)
-+ENDIF(GSM_FOUND)
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -3,7 +3,9 @@ project(libtwinkle)
- include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
-
- add_subdirectory(audio)
--add_subdirectory(audio/gsm/src)
-+if (NOT WITH_GSM)
-+ add_subdirectory(audio/gsm/src)
-+endif (NOT WITH_GSM)
- add_subdirectory(audits)
- add_subdirectory(im)
- add_subdirectory(mwi)
-@@ -54,11 +56,9 @@ set(LIBTWINKLE_SRCS
-
- add_library(libtwinkle OBJECT ${LIBTWINKLE_SRCS})
-
--add_executable(twinkle-console
-- main.cpp
-+set(twinkle_OBJS
- $<TARGET_OBJECTS:libtwinkle>
- $<TARGET_OBJECTS:libtwinkle-audio>
-- $<TARGET_OBJECTS:libtwinkle-gsm>
- $<TARGET_OBJECTS:libtwinkle-audits>
- $<TARGET_OBJECTS:libtwinkle-im>
- $<TARGET_OBJECTS:libtwinkle-mwi>
-@@ -71,15 +71,40 @@ add_executable(twinkle-console
- $<TARGET_OBJECTS:libtwinkle-threads>
- $<TARGET_OBJECTS:libtwinkle-utils>
- )
-+if (NOT WITH_GSM)
-+ list(APPEND twinkle_OBJS $<TARGET_OBJECTS:libtwinkle-gsm>)
-+endif (NOT WITH_GSM)
-+
-+add_executable(twinkle-console
-+ main.cpp
-+ ${twinkle_OBJS}
-+)
-+
-+set(twinkle_LIBS
-+ -lpthread
-+ -lresolv
-+ ${LibMagic_LIBRARY}
-+ ${LIBXML2_LIBRARIES}
-+ ${Readline_LIBRARY}
-+ ${ILBC_LIBRARIES}
-+ ${SPEEX_LIBRARIES}
-+ ${ZRTPCPP_LIBRARIES}
-+ ${CCRTP_LIBRARIES}
-+ ${COMMONCPP_LIBRARIES}
-+ ${UCOMMON_LIBRARIES}
-+ ${LIBSNDFILE_LIBRARY}
-+ ${ALSA_LIBRARY}
-+ ${G729_LIBRARY}
-+)
-+if (WITH_GSM)
-+ list(APPEND twinkle_LIBS ${GSM_LIBRARY})
-+endif (WITH_GSM)
-
- if (WITH_QT4 OR WITH_QT5)
- add_subdirectory(gui)
- endif (WITH_QT4 OR WITH_QT5)
-
--target_link_libraries(twinkle-console -lpthread -lresolv ${LibMagic_LIBRARY} ${LIBXML2_LIBRARIES}
-- ${Readline_LIBRARY} ${ILBC_LIBRARIES} ${SPEEX_LIBRARIES} ${ZRTPCPP_LIBRARIES}
-- ${CCRTP_LIBRARIES} ${COMMONCPP_LIBRARIES} ${UCOMMON_LIBRARIES} ${LIBSNDFILE_LIBRARY}
-- ${ALSA_LIBRARY} ${G729_LIBRARY})
-+target_link_libraries(twinkle-console ${twinkle_LIBS})
-
- install(TARGETS twinkle-console DESTINATION bin)
-
---- a/src/audio/audio_tx.h
-+++ b/src/audio/audio_tx.h
-@@ -30,11 +30,16 @@
- #include "rtp_telephone_event.h"
- #include "user.h"
- #include "threads/mutex.h"
--#include "gsm/inc/gsm.h"
- #include "audio_device.h"
- #include "twinkle_rtp_session.h"
- #include "twinkle_config.h"
-
-+#ifdef HAVE_GSM
-+#include <gsm/gsm.h>
-+#else
-+#include "gsm/inc/gsm.h"
-+#endif
-+
- using namespace std;
- using namespace ost;
-
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -111,30 +111,14 @@ set(TWINKLE_GUI-SRCS
- osd.cpp
- incoming_call_popup.cpp
-
-- $<TARGET_OBJECTS:libtwinkle>
-- $<TARGET_OBJECTS:libtwinkle-audio>
-- $<TARGET_OBJECTS:libtwinkle-gsm>
-- $<TARGET_OBJECTS:libtwinkle-audits>
-- $<TARGET_OBJECTS:libtwinkle-im>
-- $<TARGET_OBJECTS:libtwinkle-mwi>
-- $<TARGET_OBJECTS:libtwinkle-parser>
-- $<TARGET_OBJECTS:libtwinkle-patterns>
-- $<TARGET_OBJECTS:libtwinkle-presence>
-- $<TARGET_OBJECTS:libtwinkle-sdp>
-- $<TARGET_OBJECTS:libtwinkle-sockets>
-- $<TARGET_OBJECTS:libtwinkle-stun>
-- $<TARGET_OBJECTS:libtwinkle-threads>
-- $<TARGET_OBJECTS:libtwinkle-utils>
-+ ${twinkle_OBJS}
- ${twinkle_UIS}
- ${twinkle_QRC}
- ${twinkle_LANG}
- )
-
- add_executable(twinkle ${TWINKLE_GUI-SRCS})
--target_link_libraries(twinkle -lpthread -lresolv ${LibMagic_LIBRARY} ${LIBXML2_LIBRARIES}
-- ${Readline_LIBRARY} ${ILBC_LIBRARIES} ${SPEEX_LIBRARIES} ${ZRTPCPP_LIBRARIES}
-- ${CCRTP_LIBRARIES} ${COMMONCPP_LIBRARIES} ${UCOMMON_LIBRARIES} ${LIBSNDFILE_LIBRARY}
-- ${ALSA_LIBRARY} ${qt_LIBS} ${G729_LIBRARY})
-+target_link_libraries(twinkle ${twinkle_LIBS} ${qt_LIBS})
-
- install(TARGETS twinkle DESTINATION bin)
- install(FILES ${twinkle_LANG} DESTINATION share/twinkle/lang)
---- a/twinkle_config.h.in
-+++ b/twinkle_config.h.in
-@@ -3,6 +3,7 @@
- #cmakedefine HAVE_ILBC
- #cmakedefine HAVE_ZRTP
- #cmakedefine HAVE_BCG729
-+#cmakedefine HAVE_GSM
-
- #cmakedefine HAVE_UNISTD_H
- #cmakedefine HAVE_LINUX_TYPES_H
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d57fbc4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,15 +0,0 @@
-desktop-entry-contains-encoding-key.patch
-libgsm.patch
-include-linux-errqueue.patch
-fix-spelling.patch
-crash-fixes.patch
-fix-incoming-call-popup-repositioning.patch
-wizard-corrected-signal-name.patch
-historyform-fix-sorting-by-time-of-event.patch
-fix-ip-fields-in-nat-settings.patch
-historyform-sort-entries-after-loading-history.patch
-historyform-resize-columns-to-contents.patch
-historyform-clear-rows-before-loading-history.patch
-historyform-disable-editing.patch
-historyform-show-call-details-of-current-item.patch
-fix-conflicting-definition-of-socklen_t-on-gnu-hurd.patch
diff --git a/debian/patches/wizard-corrected-signal-name.patch b/debian/patches/wizard-corrected-signal-name.patch
deleted file mode 100644
index 6aa4287..0000000
--- a/debian/patches/wizard-corrected-signal-name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: wizard: corrected signal name
- This patch backports commit 681131451b006db5ddb066e128d2d9a69153dcec.
-Author: Peter Colberg <peter at colberg.org>
-Forwarded: not-needed
-Last-Update: 2015-12-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/gui/wizardform.ui
-+++ b/src/gui/wizardform.ui
-@@ -317,7 +317,7 @@ This field is mandatory.</string>
- </connection>
- <connection>
- <sender>authNameLineEdit</sender>
-- <signal>lostFocus()</signal>
-+ <signal>editingFinished()</signal>
- <receiver>WizardForm</receiver>
- <slot>disableSuggestAuthName()</slot>
- </connection>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git
More information about the Pkg-voip-commits
mailing list