commit 8ab4a814b8c1489e7dfc2c25afab4f272827bd2e
author Sébastien Blin <sebastien.blin@savoirfairelinux.com> Tue Feb 27 13:24:17 2018 -0500
committer Philippe Gorley <philippe.gorley@savoirfairelinux.com> Wed Feb 28 15:23:13 2018 -0500
tree b3f2b92e23b5b2cc6d99c7413987db048f58f7bb
parent 162eb0f47ec4f559e8db1abcf4d8375ec0432b22

chatview: fix add button and invitation visibility

Change-Id: I3b1abc6432901caec56f6d6147bfefa1de844844
Reviewed-by: Philippe Gorley <philippe.gorley@savoirfairelinux.com>

src/ringmainwindow.cpp

diff --git a/src/ringmainwindow.cpp b/src/ringmainwindow.cpp
index 2c58072..ab3a3b6 100644
--- a/src/ringmainwindow.cpp
+++ b/src/ringmainwindow.cpp
@@ -873,9 +873,10 @@
         auto contactUri = chatViewConversation_->participants.front();
         auto contactInfo = accountContainer_->info.contactModel->getContact(contactUri);
         if (auto chat_view = current_call_view_get_chat_view(CURRENT_CALL_VIEW(new_view))) {
+            auto isPending = contactInfo.profileInfo.type == lrc::api::profile::Type::PENDING;
             chat_view_update_temporary(CHAT_VIEW(chat_view),
-                                       contactInfo.profileInfo.type == lrc::api::profile::Type::PENDING
-                                       || contactInfo.profileInfo.type == lrc::api::profile::Type::TEMPORARY);
+                                       isPending || contactInfo.profileInfo.type == lrc::api::profile::Type::TEMPORARY,
+                                       isPending);
         }
     } catch(...) { }
 
@@ -1370,9 +1371,10 @@
         try {
             auto contactUri =  chatViewConversation_->participants.front();
             auto contactInfo = accountContainer_->info.contactModel->getContact(contactUri);
+            auto isPending = contactInfo.profileInfo.type == lrc::api::profile::Type::PENDING;
             chat_view_update_temporary(CHAT_VIEW(gtk_bin_get_child(GTK_BIN(widgets->frame_call))),
-                                       contactInfo.profileInfo.type == lrc::api::profile::Type::PENDING
-                                       || contactInfo.profileInfo.type == lrc::api::profile::Type::TEMPORARY);
+                                       isPending || contactInfo.profileInfo.type == lrc::api::profile::Type::TEMPORARY,
+                                       isPending);
         } catch(...) { }
     }
 }
@@ -1403,12 +1405,18 @@
     current_item.uid = "-1";
     if (IS_CHAT_VIEW(old_view))
         current_item = chat_view_get_conversation(CHAT_VIEW(old_view));
+    // Do not show a conversation without any participants
+    if (origin.participants.empty()) return;
+    auto firstContactUri = origin.participants.front();
+    auto contactInfo = accountContainer_->info.contactModel->getContact(firstContactUri);
+    // change view if necessary or just update temporary
     if (current_item.uid != origin.uid) {
-        if (origin.participants.empty()) return;
-        auto firstContactUri = origin.participants.front();
-        auto contactInfo = accountContainer_->info.contactModel->getContact(firstContactUri);
-        if (contactInfo.profileInfo.type == lrc::api::profile::Type::PENDING && current_item.uid != "-1") return;
         changeView(CHAT_VIEW_TYPE, origin);
+    } else {
+        auto isPending = contactInfo.profileInfo.type == lrc::api::profile::Type::PENDING;
+        chat_view_update_temporary(CHAT_VIEW(old_view),
+                                   isPending || contactInfo.profileInfo.type == lrc::api::profile::Type::TEMPORARY,
+                                   isPending);
     }
 }