From be751a5dda6e4b4612276d278f59f9f96ed0298c Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Sat, 12 Feb 2022 14:07:19 +0100
Subject: Various call fixes

- If peer invited us claiming audio-only and then wants to have a video content, do a content-modify and accept audio-only
- Check contents for video (and modify) and whether call is truly accepted in PeerState.accept() directly
- If a message contains both JMI and CIM, only use JMI
- Fix outgoing CIM (disabled)
- Use opacity instead of visiblity for file_menu, small fixes
- Add back owner/admin/member queries when joining MUC (regression from 33104a7)
---
 main/data/file_default_widget.ui                               | 3 ++-
 main/src/ui/conversation_content_view/file_default_widget.vala | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'main')

diff --git a/main/data/file_default_widget.ui b/main/data/file_default_widget.ui
index 7da52ec2..6315e230 100644
--- a/main/data/file_default_widget.ui
+++ b/main/data/file_default_widget.ui
@@ -90,7 +90,8 @@
                         </child>
                         <child>
                             <object class="GtkMenuButton" id="file_menu">
-                                <property name="visible">False</property>
+                                <property name="visible">True</property>
+                                <property name="opacity">0</property>
                                 <property name="relief">none</property>
                                 <child>
                                     <object class="GtkImage">
diff --git a/main/src/ui/conversation_content_view/file_default_widget.vala b/main/src/ui/conversation_content_view/file_default_widget.vala
index dc952b30..28b7d477 100644
--- a/main/src/ui/conversation_content_view/file_default_widget.vala
+++ b/main/src/ui/conversation_content_view/file_default_widget.vala
@@ -85,7 +85,7 @@ public class FileDefaultWidget : EventBox {
             image_stack.set_visible_child_name("download_image");
         }
         if (state == FileTransfer.State.COMPLETE) {
-            file_menu.visible = true;
+            file_menu.opacity = 1;
         }
         return false;
     }
@@ -104,7 +104,7 @@ public class FileDefaultWidget : EventBox {
         if (state == FileTransfer.State.NOT_STARTED) {
             image_stack.set_visible_child_name("content_type_image");
         }
-        file_menu.visible = false;
+        file_menu.opacity = 0;
     }
 
     private static string get_file_icon_name(string? mime_type) {
-- 
cgit v1.2.3-70-g09d2