'[ring-kde] /: IAX2: Fully remove support for IAX2'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ring-kde] /: IAX2: Fully remove support for IAX2
From:       Emmanuel Lepage Vallee <elv1313 () gmail ! com>
Date:       2016-06-30 19:11:58
Message-ID: E1bIhNW-0003Th-Fk () code ! kde ! org
[Download RAW message or body]

Git commit d896c6534d0c8badc414d4088becea95d68e3590 by Emmanuel Lepage Vallee.
Committed on 30/06/2016 at 19:12.
Pushed by lepagevalleeemmanuel into branch 'master'.

IAX2: Fully remove support for IAX2

It was disabled for 18 months, nobody complained and now Debian
asked and other distributors asked for the libiax2 dependency to
be removed due to the missing "or later" in their license.

M  +29   -29   data/cx.ring.ring-kde.appdata.xml
M  +26   -26   data/ring-kde.desktop
M  +0    -3    src/conf/account/accountpages/account.cpp
M  +0    -4    src/conf/dlghooks.cpp
M  +0    -3    src/klib/ring-kde.kcfg

http://commits.kde.org/ring-kde/d896c6534d0c8badc414d4088becea95d68e3590

diff --git a/data/cx.ring.ring-kde.appdata.xml b/data/cx.ring.ring-kde.appdata.xml
index 7a6d7a6..f36db21 100644
--- a/data/cx.ring.ring-kde.appdata.xml
+++ b/data/cx.ring.ring-kde.appdata.xml
@@ -23,21 +23,21 @@
   <name xml:lang="uk">Ring-KDE</name>
   <name xml:lang="x-test">xxRing-KDExx</name>
   <name xml:lang="zh-CN">Ring-KDE</name>
-  <summary>Call and receive calls with SIP, IAX or RING protocols</summary>
-  <summary xml:lang="ca">Truca i rep trucades amb els protocols SIP, IAX o \
                RING.</summary>
-  <summary xml:lang="ca-valencia">Truca i rep trucades amb els protocols SIP, IAX o \
                RING.</summary>
-  <summary xml:lang="cs">Volejte a přijímejte hovory s protokoly SIP, IAX nebo \
                RING</summary>
-  <summary xml:lang="da">Foretag og modtag opkald med protokollerne SIP, IAX eller \
                RING</summary>
-  <summary xml:lang="es">Llamar y recibir llamadas con los protocolos SIP, IAX o \
                RING</summary>
-  <summary xml:lang="gl">Chamar e recibir chamadas mediante os protocolos SIP, IAX e \
                RING.</summary>
-  <summary xml:lang="it">Chiama e ricevi telefonate con i protocolli SIP, IAX o \
                RING</summary>
-  <summary xml:lang="nl">Maak of ontvang oproepen met SIP, IAX of \
                RING-protocollen</summary>
-  <summary xml:lang="pl">Dzwoń i odbieraj rozmowy przy użyciu protokołów SIP, \
                IAX lub RING</summary>
-  <summary xml:lang="pt">Fazer e receber chamadas com os protocolos SIP, IAX ou \
                RING</summary>
-  <summary xml:lang="pt-BR">Fazer e receber chamadas com os protocolos SIP, IAX ou \
                RING</summary>
-  <summary xml:lang="sv">Ring och ta emot samtal med SIP-, IAX- eller \
                RING-protokoll</summary>
-  <summary xml:lang="uk">Дзвоніть і отримуйте дзвінки за \
                допомогою протоколів SIP, IAX або \
                RING</summary>
-  <summary xml:lang="x-test">xxCall and receive calls with SIP, IAX or RING \
protocolsxx</summary> +  <summary>Call and receive calls with SIP or RING \
protocols</summary> +  <summary xml:lang="ca">Truca i rep trucades amb els protocols \
SIP o RING.</summary> +  <summary xml:lang="ca-valencia">Truca i rep trucades amb els \
protocols SIP o RING.</summary> +  <summary xml:lang="cs">Volejte a přijímejte \
hovory s protokoly SIP nebo RING</summary> +  <summary xml:lang="da">Foretag og \
modtag opkald med protokollerne SIP eller RING</summary> +  <summary \
xml:lang="es">Llamar y recibir llamadas con los protocolos SIP o RING</summary> +  \
<summary xml:lang="gl">Chamar e recibir chamadas mediante os protocolos SIP e \
RING.</summary> +  <summary xml:lang="it">Chiama e ricevi telefonate con i protocolli \
SIP o RING</summary> +  <summary xml:lang="nl">Maak of ontvang oproepen met SIP of \
RING-protocollen</summary> +  <summary xml:lang="pl">Dzwoń i odbieraj rozmowy przy \
użyciu protokołów SIP lub RING</summary> +  <summary xml:lang="pt">Fazer e receber \
chamadas com os protocolos SIP ou RING</summary> +  <summary xml:lang="pt-BR">Fazer e \
receber chamadas com os protocolos SIP ou RING</summary> +  <summary \
xml:lang="sv">Ring och ta emot samtal med SIP- eller RING-protokoll</summary> +  \
<summary xml:lang="uk">Дзвоніть і отримуйте дзвінки за \
допомогою протоколів SIP або RING</summary> +  <summary \
xml:lang="x-test">xxCall and receive calls with SIP or RING protocolsxx</summary>  \
<description>  <p>
       Ring-KDE is a graphical client for the Ring (www.ring.cx) communication
@@ -91,20 +91,20 @@
       <li xml:lang="sv">Ring till normala telefoner med konton från vanliga \
SIP-leverantörer</li>  <li xml:lang="uk">Дзвінки на звичайні \
телефони за допомогою облікових записів із \
                загальних систем надання послуг SIP</li>
       <li xml:lang="x-test">xxCalling real phone with accounts from common SIP \
                service providersxx</li>
-      <li>Support SIP, SIPS, IAX2 and the RING distributed communication \
                protocol</li>
-      <li xml:lang="ast">Sofita SIP, SIPS, IAX2 y el protocolu de comunicación \
                distribuyida RING</li>
-      <li xml:lang="ca">Implementació dels protocols de comunicació distribuïda \
                SIP, SIPS, IAX2 i RING</li>
-      <li xml:lang="ca-valencia">Implementació dels protocols de comunicació \
                distribuïda SIP, SIPS, IAX2 i RING</li>
-      <li xml:lang="es">Permite el uso de SIP, SIPS, IAX2 y del protocolo de \
                comunicaciones distribuidas RING</li>
-      <li xml:lang="gl">Compatibilidade con SIP, SIPS, IAX2 e o protocolo de \
                comunicación distribuída RING.</li>
-      <li xml:lang="it">Supporta SIP, SIPS, IAX2 e il protocollo di comunicazione \
                distribuita RING</li>
-      <li xml:lang="nl">Ondersteunt SIP, SIPS, IAX2 en het RING gedistribueerde \
                communicatieprotocol</li>
-      <li xml:lang="pl">Obsługa protokołów komunikacyjnych SIP, SIPS, IAX2 oraz \
                RING</li>
-      <li xml:lang="pt">Suporta os protocolos de comunicação SIP, SIPS, IAX2 e o \
                protocolo distribuído do RING</li>
-      <li xml:lang="pt-BR">Suporte aos protocolos de comunicação SIP, SIPS, IAX2 e \
                o protocolo de comunicação distribuída do RING</li>
-      <li xml:lang="sv">Stöder SIP, SIPS, IAX2 och det distribuerade \
                RING-kommunikationsprotokollet</li>
-      <li xml:lang="uk">Підтримка SIP, SIPS, IAX2 і протоколу \
                розподіленого обміну даними RING</li>
-      <li xml:lang="x-test">xxSupport SIP, SIPS, IAX2 and the RING distributed \
communication protocolxx</li> +      <li>Support SIP, SIPS and the RING distributed \
communication protocol</li> +      <li xml:lang="ast">Sofita SIP, SIPS y el protocolu \
de comunicación distribuyida RING</li> +      <li xml:lang="ca">Implementació dels \
protocols de comunicació distribuïda SIP, SIPS i RING</li> +      <li \
xml:lang="ca-valencia">Implementació dels protocols de comunicació distribuïda \
SIP, SIPS i RING</li> +      <li xml:lang="es">Permite el uso de SIP, SIPS y del \
protocolo de comunicaciones distribuidas RING</li> +      <li \
xml:lang="gl">Compatibilidade con SIP, SIPS e o protocolo de comunicación \
distribuída RING.</li> +      <li xml:lang="it">Supporta SIP, SIPS e il protocollo \
di comunicazione distribuita RING</li> +      <li xml:lang="nl">Ondersteunt SIP, SIPS \
en het RING gedistribueerde communicatieprotocol</li> +      <li \
xml:lang="pl">Obsługa protokołów komunikacyjnych SIP, SIPS oraz RING</li> +      \
<li xml:lang="pt">Suporta os protocolos de comunicação SIP, SIPS e o protocolo \
distribuído do RING</li> +      <li xml:lang="pt-BR">Suporte aos protocolos de \
comunicação SIP, SIPS e o protocolo de comunicação distribuída do RING</li> +    \
<li xml:lang="sv">Stöder SIP, SIPS och det distribuerade \
RING-kommunikationsprotokollet</li> +      <li xml:lang="uk">Підтримка SIP, \
SIPS і протоколу розподіленого обміну даними \
RING</li> +      <li xml:lang="x-test">xxSupport SIP, SIPS and the RING distributed \
communication protocolxx</li>  <li>Audio, Video and rich text messages</li>
       <li xml:lang="ca">Missatges d'� udio, vídeo i de text enriquit</li>
       <li xml:lang="ca-valencia">Missatges d'� udio, vídeo i de text enriquit</li>
diff --git a/data/ring-kde.desktop b/data/ring-kde.desktop
index 2a01995..6bfcaa6 100755
--- a/data/ring-kde.desktop
+++ b/data/ring-kde.desktop
@@ -43,32 +43,32 @@ GenericName[sv]=Ring
 GenericName[tr]=Ring
 GenericName[uk]=Ring
 GenericName[x-test]=xxRingxx
-Comment=Call and receive calls with SIP or IAX protocols
-Comment[ast]=Llama y recibi llamaes colos protocolos SIP o IAX
-Comment[bs]=Pozivajte i primajte pozive s protokolom SIP ili IAX
-Comment[ca]=Truca i rep trucades amb els protocols SIP o IAX
-Comment[ca@valencia]=Truca i rep trucades amb els protocols SIP o IAX
-Comment[cs]=Volejte a přijímejte hovory s protokoly SIP a IAX
-Comment[da]=Foretag og modtag opkald med protokollerne SIP eller IAX
-Comment[de]=Anrufen und Anrufe annehmen mit SIP- oder IAX-Protokollen
-Comment[es]=Llamar y recibir llamadas de protocolos IAX y SIP
-Comment[et]=Kõnede tegemine ja vastuvõtmine SIP või IAX protokolli vahendusel
-Comment[fr]=Appeler et recevoir des appels avec les protocoles  �  SIP   � ou  �  \
                IAX   �
-Comment[gl]=Chamar e recibir chamadas mediante os protocolos SIP e IAX.
-Comment[hu]=Hívások kezdeményezése és fogadása SIP vagy IAX protokollokkal
-Comment[it]=Chiama e ricevi telefonate con i protocolli SIP o IAX
-Comment[nl]=Maak of ontvang oproepen met SIP of IAX-protocollen
-Comment[pl]=Dzwoń i odbieraj przy użyciu protokołów SIP lub IAX
-Comment[pt]=Fazer e receber chamadas com os protocolos SIP ou IAX
-Comment[pt_BR]=Faz e recebe chamadas com os protocolos SIP ou IAX
-Comment[ru]=Вызовы по протоколу SIP и IAX
-Comment[sk]=Volanie a prijímanie hovorov cez protokoly SIP alebo IAX
-Comment[sv]=Ring och ta emot samtal med SIP- eller IAX-protokoll
-Comment[tr]=SIP veya IAX protokolleri ile arama yapın veya aranın
-Comment[ug]=SIP ياكى IAX كېلىشىمى ئارقىلىق تېلېفون \
                قىلىش ۋە تېلېفون قوبۇل قىلىش
-Comment[uk]=Дзвоніть і отримуйте дзвінки за \
                допомогою протоколів SIP і IAX
-Comment[x-test]=xxCall and receive calls with SIP or IAX protocolsxx
-Comment[zh_CN]=通过 SIP 和 IAX 协议呼叫和接收呼叫
+Comment=Call and receive calls with SIP or RING protocols
+Comment[ast]=Llama y recibi llamaes colos protocolos SIP o RING
+Comment[bs]=Pozivajte i primajte pozive s protokolom SIP ili RING
+Comment[ca]=Truca i rep trucades amb els protocols SIP o RING
+Comment[ca@valencia]=Truca i rep trucades amb els protocols SIP o RING
+Comment[cs]=Volejte a přijímejte hovory s protokoly SIP a RING
+Comment[da]=Foretag og modtag opkald med protokollerne SIP eller RING
+Comment[de]=Anrufen und Anrufe annehmen mit SIP- oder RING-Protokollen
+Comment[es]=Llamar y recibir llamadas de protocolos RING y SIP
+Comment[et]=Kõnede tegemine ja vastuvõtmine SIP või RING protokolli vahendusel
+Comment[fr]=Appeler et recevoir des appels avec les protocoles  �  SIP   � ou  �  \
RING   � +Comment[gl]=Chamar e recibir chamadas mediante os protocolos SIP e RING.
+Comment[hu]=Hívások kezdeményezése és fogadása SIP vagy RING protokollokkal
+Comment[it]=Chiama e ricevi telefonate con i protocolli SIP o RING
+Comment[nl]=Maak of ontvang oproepen met SIP of RING-protocollen
+Comment[pl]=Dzwoń i odbieraj przy użyciu protokołów SIP lub RING
+Comment[pt]=Fazer e receber chamadas com os protocolos SIP ou RING
+Comment[pt_BR]=Faz e recebe chamadas com os protocolos SIP ou RING
+Comment[ru]=Вызовы по протоколу SIP и RING
+Comment[sk]=Volanie a prijímanie hovorov cez protokoly SIP alebo RING
+Comment[sv]=Ring och ta emot samtal med SIP- eller RING-protokoll
+Comment[tr]=SIP veya RING protokolleri ile arama yapın veya aranın
+Comment[ug]=SIP ياكى RING كېلىشىمى ئارقىلىق تېلېفون \
قىلىش ۋە تېلېفون قوبۇل قىلىش +Comment[uk]=Дзвоніть і \
отримуйте дзвінки за допомогою протоколів SIP і \
RING +Comment[x-test]=xxCall and receive calls with SIP or RING protocolsxx
+Comment[zh_CN]=通过 SIP 和 RING 协议呼叫和接收呼叫
 Exec=ring-kde
 Icon=ring-kde
 StartupNotify=true
diff --git a/src/conf/account/accountpages/account.cpp \
b/src/conf/account/accountpages/account.cpp index 7e65d3a..17a5445 100644
--- a/src/conf/account/accountpages/account.cpp
+++ b/src/conf/account/accountpages/account.cpp
@@ -60,9 +60,6 @@ void Pages::Account::setAccount(::Account* a)
    m_pAdapter = new AccountSerializationAdapter(a, this);
 
    switch (a->protocol()) {
-      case ::Account::Protocol::IAX:
-         m_pPages->setTabEnabled(4,false);
-         break;
       case ::Account::Protocol::RING:
       case ::Account::Protocol::SIP:
          m_pPages->setTabEnabled(4, a->isNew() || a->id() != "IP2IP");
diff --git a/src/conf/dlghooks.cpp b/src/conf/dlghooks.cpp
index 3888548..b87cb80 100644
--- a/src/conf/dlghooks.cpp
+++ b/src/conf/dlghooks.cpp
@@ -36,19 +36,16 @@ DlgHooks::~DlgHooks()
 void DlgHooks::updateWidgets()
 {
    kcfg_enableHooksSIP->blockSignals(true);
-   kcfg_enableHooksIAX->blockSignals(true);
    kcfg_hooksCommand->blockSignals(true);
    kcfg_prepend->blockSignals(true);
    kcfg_hooksSIPHeader->blockSignals(true);
    kcfg_addPrefix->blockSignals(true);
    kcfg_enableHooksSIP  ->setChecked(HookManager::instance().isSipEnabled        \
                ());
-   kcfg_enableHooksIAX  ->setChecked(HookManager::instance().isIax2Enabled       \
());  kcfg_hooksCommand    ->setText   (HookManager::instance().command             \
());  kcfg_prepend         ->setText   (HookManager::instance().prefix              \
());  kcfg_hooksSIPHeader  ->setText   (HookManager::instance().sipFeild            \
());  kcfg_addPrefix       \
->setChecked(HookManager::instance().isContactMethodEnabled());  \
                kcfg_enableHooksSIP->blockSignals(false);
-   kcfg_enableHooksIAX->blockSignals(false);
    kcfg_hooksCommand->blockSignals(false);
    kcfg_prepend->blockSignals(false);
    kcfg_hooksSIPHeader->blockSignals(false);
@@ -58,7 +55,6 @@ void DlgHooks::updateWidgets()
 void DlgHooks::updateSettings()
 {
    HookManager::instance().setSipEnabled        (kcfg_enableHooksSIP  \
                ->isChecked());
-   HookManager::instance().setIax2Enabled       (kcfg_enableHooksIAX  \
->isChecked());  HookManager::instance().setCommand           (kcfg_hooksCommand    \
->text     ());  HookManager::instance().setPrefix            (kcfg_prepend         \
->text     ());  HookManager::instance().setSipFeild          (kcfg_hooksSIPHeader  \
                ->text     ());
diff --git a/src/klib/ring-kde.kcfg b/src/klib/ring-kde.kcfg
index eae2416..83f8cad 100644
--- a/src/klib/ring-kde.kcfg
+++ b/src/klib/ring-kde.kcfg
@@ -249,9 +249,6 @@
 <!--    <entry name="enableHooksSIP" type="Bool">
     	<label>Defines whether to enable hooks for SIP accounts.</label>
     </entry>
-    <entry name="enableHooksIAX" type="Bool">
-    	<label>Defines whether to enable hooks for IAX accounts.</label>
-    </entry>
     <entry name="hooksSIPHeader" type="String">
     	<label>Defines which header to catch for SIP accounts hooks.</label>
     </entry>


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic