[Pkg-voip-commits] [twinkle] 70/73: Cherry-pick UI fixes from upstream git
Peter Colberg
pc-guest at moszumanska.debian.org
Wed Jan 6 00:31:56 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 9ad9688ea776759be4612d671f06f46c723280f6
Author: Peter Colberg <peter at colberg.org>
Date: Wed Dec 30 23:37:45 2015 -0500
Cherry-pick UI fixes from upstream git
---
debian/patches/crash-fixes.patch | 115 ++++
.../fix-incoming-call-popup-repositioning.patch | 17 +
debian/patches/fix-ip-fields-in-nat-settings.patch | 644 +++++++++++++++++++++
...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/series | 10 +
debian/patches/wizard-corrected-signal-name.patch | 18 +
11 files changed, 1022 insertions(+)
diff --git a/debian/patches/crash-fixes.patch b/debian/patches/crash-fixes.patch
new file mode 100644
index 0000000..8c1c9ab
--- /dev/null
+++ b/debian/patches/crash-fixes.patch
@@ -0,0 +1,115 @@
+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/fix-incoming-call-popup-repositioning.patch b/debian/patches/fix-incoming-call-popup-repositioning.patch
new file mode 100644
index 0000000..8abb72f
--- /dev/null
+++ b/debian/patches/fix-incoming-call-popup-repositioning.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000..3bfbbb7
--- /dev/null
+++ b/debian/patches/fix-ip-fields-in-nat-settings.patch
@@ -0,0 +1,644 @@
+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/historyform-clear-rows-before-loading-history.patch b/debian/patches/historyform-clear-rows-before-loading-history.patch
new file mode 100644
index 0000000..7f4ab5b
--- /dev/null
+++ b/debian/patches/historyform-clear-rows-before-loading-history.patch
@@ -0,0 +1,18 @@
+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
new file mode 100644
index 0000000..d30f945
--- /dev/null
+++ b/debian/patches/historyform-disable-editing.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000..d115579
--- /dev/null
+++ b/debian/patches/historyform-fix-sorting-by-time-of-event.patch
@@ -0,0 +1,27 @@
+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
new file mode 100644
index 0000000..30ebcd3
--- /dev/null
+++ b/debian/patches/historyform-resize-columns-to-contents.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 0000000..03b0bc6
--- /dev/null
+++ b/debian/patches/historyform-show-call-details-of-current-item.patch
@@ -0,0 +1,104 @@
+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
new file mode 100644
index 0000000..e33763c
--- /dev/null
+++ b/debian/patches/historyform-sort-entries-after-loading-history.patch
@@ -0,0 +1,27 @@
+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/series b/debian/patches/series
index d923dbe..1b7bf13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,13 @@ 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
diff --git a/debian/patches/wizard-corrected-signal-name.patch b/debian/patches/wizard-corrected-signal-name.patch
new file mode 100644
index 0000000..6aa4287
--- /dev/null
+++ b/debian/patches/wizard-corrected-signal-name.patch
@@ -0,0 +1,18 @@
+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