Commit 3cb6a942 authored by Chris Talbot's avatar Chris Talbot Committed by Mohammed Sadiq
Browse files

chat-view: attach files to message if attachment-view has files

parent 44e6ed47
Pipeline #71907 passed with stages
in 10 minutes and 32 seconds
...@@ -484,9 +484,12 @@ chat_view_send_message_button_clicked_cb (ChattyChatView *self) ...@@ -484,9 +484,12 @@ chat_view_send_message_button_clicked_cb (ChattyChatView *self)
g_autoptr(ChattyMessage) msg = NULL; g_autoptr(ChattyMessage) msg = NULL;
g_autofree char *message = NULL; g_autofree char *message = NULL;
GtkTextIter start, end; GtkTextIter start, end;
GList *files;
g_assert (CHATTY_IS_CHAT_VIEW (self)); g_assert (CHATTY_IS_CHAT_VIEW (self));
files = chatty_attachments_view_get_files (CHATTY_ATTACHMENTS_VIEW (self->attachment_view));
gtk_text_buffer_get_bounds (self->message_input_buffer, &start, &end); gtk_text_buffer_get_bounds (self->message_input_buffer, &start, &end);
message = gtk_text_buffer_get_text (self->message_input_buffer, &start, &end, FALSE); message = gtk_text_buffer_get_text (self->message_input_buffer, &start, &end, FALSE);
...@@ -504,7 +507,7 @@ chat_view_send_message_button_clicked_cb (ChattyChatView *self) ...@@ -504,7 +507,7 @@ chat_view_send_message_button_clicked_cb (ChattyChatView *self)
gtk_widget_grab_focus (self->message_input); gtk_widget_grab_focus (self->message_input);
if (gtk_text_buffer_get_char_count (self->message_input_buffer)) { if (gtk_text_buffer_get_char_count (self->message_input_buffer) || files) {
g_autofree char *escaped = NULL; g_autofree char *escaped = NULL;
ChattyProtocol protocol; ChattyProtocol protocol;
...@@ -519,12 +522,16 @@ chat_view_send_message_button_clicked_cb (ChattyChatView *self) ...@@ -519,12 +522,16 @@ chat_view_send_message_button_clicked_cb (ChattyChatView *self)
NULL, time (NULL), NULL, time (NULL),
escaped ? CHATTY_MESSAGE_HTML_ESCAPED : CHATTY_MESSAGE_TEXT, escaped ? CHATTY_MESSAGE_HTML_ESCAPED : CHATTY_MESSAGE_TEXT,
CHATTY_DIRECTION_OUT, 0); CHATTY_DIRECTION_OUT, 0);
if (files) {
chatty_message_set_files (msg, files);
}
chatty_chat_send_message_async (self->chat, msg, chatty_chat_send_message_async (self->chat, msg,
view_send_message_async_cb, view_send_message_async_cb,
g_object_ref (self)); g_object_ref (self));
gtk_widget_hide (self->send_message_button); gtk_widget_hide (self->send_message_button);
} }
chatty_attachments_view_reset (CHATTY_ATTACHMENTS_VIEW (self->attachment_view));
gtk_text_buffer_delete (self->message_input_buffer, &start, &end); gtk_text_buffer_delete (self->message_input_buffer, &start, &end);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment