Fix drag and drop uploading

This commit is contained in:
fiaxh 2022-10-08 13:19:03 +02:00
parent 21ab48e09a
commit 85342ee2eb
2 changed files with 13 additions and 19 deletions

View file

@ -55,12 +55,6 @@ public class ConversationView : Widget {
} }
} }
public override void dispose() {
// To prevent a warning when closing Dino
// "Can't set a target list on a widget until you've called gtk_drag_dest_set() to make the widget into a drag destination"
// Gtk.drag_dest_unset(this);
}
private void on_upper_notify() { private void on_upper_notify() {
print("on_upper_notify\n"); print("on_upper_notify\n");
if (at_current_content) { if (at_current_content) {

View file

@ -154,11 +154,12 @@ public class ConversationViewController : Object {
conversation_topic = null; conversation_topic = null;
} }
private void update_file_upload_status() { private async void update_file_upload_status() {
stream_interactor.get_module(FileManager.IDENTITY).is_upload_available.begin(conversation, (_, res) => { if (conversation == null) return;
bool upload_available = stream_interactor.get_module(FileManager.IDENTITY).is_upload_available.end(res);
bool upload_available = yield stream_interactor.get_module(FileManager.IDENTITY).is_upload_available(conversation);
chat_input_controller.set_file_upload_active(upload_available); chat_input_controller.set_file_upload_active(upload_available);
if (conversation.account.bare_jid.to_string().has_prefix("f")) { if (upload_available && overlay_dialog == null) {
if (drop_event_controller.widget == null) { if (drop_event_controller.widget == null) {
view.add_controller(drop_event_controller); view.add_controller(drop_event_controller);
} }
@ -167,7 +168,6 @@ public class ConversationViewController : Object {
view.remove_controller(drop_event_controller); view.remove_controller(drop_event_controller);
} }
} }
});
} }
private void update_conversation_display_name() { private void update_conversation_display_name() {