aboutsummaryrefslogtreecommitdiff
path: root/src/ui/chat.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/chat.c')
-rw-r--r--src/ui/chat.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/ui/chat.c b/src/ui/chat.c
index d266726..4928c04 100644
--- a/src/ui/chat.c
+++ b/src/ui/chat.c
@@ -38,6 +38,7 @@
38#include "../application.h" 38#include "../application.h"
39#include "../contact.h" 39#include "../contact.h"
40#include "../file.h" 40#include "../file.h"
41#include "../ui.h"
41 42
42static gboolean 43static gboolean
43_flap_chat_details_reveal_switch(gpointer user_data) 44_flap_chat_details_reveal_switch(gpointer user_data)
@@ -520,7 +521,7 @@ handle_send_record_button_click(GtkButton *button,
520 { 521 {
521 UI_FILE_LOAD_ENTRY_Handle *file_load = ui_file_load_entry_new(app); 522 UI_FILE_LOAD_ENTRY_Handle *file_load = ui_file_load_entry_new(app);
522 523
523 gtk_label_set_text(file_load->file_label, handle->recording_filename); 524 ui_label_set_text(file_load->file_label, handle->recording_filename);
524 gtk_progress_bar_set_fraction(file_load->load_progress_bar, 0.0); 525 gtk_progress_bar_set_fraction(file_load->load_progress_bar, 0.0);
525 526
526 struct GNUNET_CHAT_File *file = GNUNET_CHAT_context_send_file( 527 struct GNUNET_CHAT_File *file = GNUNET_CHAT_context_send_file(
@@ -1493,17 +1494,14 @@ ui_chat_update(UI_CHAT_Handle *handle,
1493 ); 1494 );
1494 } 1495 }
1495 1496
1496 hdy_avatar_set_text(handle->chat_avatar, title? title : ""); 1497 ui_avatar_set_text(handle->chat_avatar, title);
1497 hdy_avatar_set_icon_name(handle->chat_avatar, icon); 1498 hdy_avatar_set_icon_name(handle->chat_avatar, icon);
1498 1499
1499 hdy_avatar_set_text(handle->chat_details_avatar, title? title : ""); 1500 ui_avatar_set_text(handle->chat_details_avatar, title);
1500 hdy_avatar_set_icon_name(handle->chat_details_avatar, icon); 1501 hdy_avatar_set_icon_name(handle->chat_details_avatar, icon);
1501 1502
1502 if (title) 1503 ui_label_set_text(handle->chat_title, title);
1503 { 1504 ui_label_set_text(handle->chat_details_label, title);
1504 gtk_label_set_text(handle->chat_title, title);
1505 gtk_label_set_text(handle->chat_details_label, title);
1506 }
1507 1505
1508 if (subtitle->len > 0) 1506 if (subtitle->len > 0)
1509 gtk_label_set_text(handle->chat_subtitle, subtitle->str); 1507 gtk_label_set_text(handle->chat_subtitle, subtitle->str);
@@ -1694,7 +1692,7 @@ ui_chat_remove_file_load(UI_CHAT_Handle *handle,
1694 1692
1695 gtk_container_remove( 1693 gtk_container_remove(
1696 GTK_CONTAINER(handle->chat_load_listbox), 1694 GTK_CONTAINER(handle->chat_load_listbox),
1697 gtk_widget_get_parent(GTK_WIDGET(file_load->entry_box)) 1695 gtk_widget_get_parent(file_load->entry_box)
1698 ); 1696 );
1699 1697
1700 if (handle->loads) 1698 if (handle->loads)