From 29d54f7ec721f90e9cd44a5fe70571b8bc3c0d7b Mon Sep 17 00:00:00 2001
From: Wescoeur <ronan.abhamon@gmail.com>
Date: Fri, 9 Jun 2017 19:12:19 +0200
Subject: [PATCH] fix(ui/views/App/Calls/Conference): remove useless tooltip
 that block button animations on pause

---
 linphone-desktop/assets/languages/en.ts            |  8 --------
 linphone-desktop/assets/languages/fr.ts            |  8 --------
 linphone-desktop/ui/views/App/Calls/Conference.qml | 14 ++++++++------
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts
index ad3412e43..f964e9323 100644
--- a/linphone-desktop/assets/languages/en.ts
+++ b/linphone-desktop/assets/languages/en.ts
@@ -443,14 +443,6 @@ Server url not configured.</translation>
         <source>conferenceTitle</source>
         <translation>CONFERENCE</translation>
     </message>
-    <message>
-        <source>leaveConf</source>
-        <translation>Temporarily leave the conference</translation>
-    </message>
-    <message>
-        <source>joinBackConf</source>
-        <translation>Join back the conference</translation>
-    </message>
 </context>
 <context>
     <name>ConferenceControls</name>
diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts
index f316483e2..cf17bb00a 100644
--- a/linphone-desktop/assets/languages/fr.ts
+++ b/linphone-desktop/assets/languages/fr.ts
@@ -443,14 +443,6 @@ Url du serveur non configurée.</translation>
         <source>conferenceTitle</source>
         <translation>CONFÉRENCE</translation>
     </message>
-    <message>
-        <source>leaveConf</source>
-        <translation>Quitter temporairement la conférence</translation>
-    </message>
-    <message>
-        <source>joinBackConf</source>
-        <translation>Rejoindre la conférence</translation>
-    </message>
 </context>
 <context>
     <name>ConferenceControls</name>
diff --git a/linphone-desktop/ui/views/App/Calls/Conference.qml b/linphone-desktop/ui/views/App/Calls/Conference.qml
index bb95defeb..8a0d9e9f3 100644
--- a/linphone-desktop/ui/views/App/Calls/Conference.qml
+++ b/linphone-desktop/ui/views/App/Calls/Conference.qml
@@ -234,18 +234,20 @@ Rectangle {
           rightMargin: CallStyle.actionArea.rightButtonsGroupMargin
           verticalCenter: parent.verticalCenter
         }
+
         iconSize: CallStyle.actionArea.iconSize
 
         ActionSwitch {
-          icon: 'pause'
           enabled: conference.conferenceModel.isInConf
+          icon: 'pause'
 
           onClicked: {
-            conference.conferenceModel.isInConf ? conference.conferenceModel.leave() : conference.conferenceModel.join()
-          }
-
-          TooltipArea {
-            text: conference.conferenceModel.isInConf ? qsTr('leaveConf') : qsTr('joinBackConf')
+            var model = conference.conferenceModel
+            if (model.isInConf) {
+              model.leave()
+            } else {
+              model.join()
+            }
           }
         }