messenger-gtk

Gtk+3 graphical user interfaces for GNUnet Messenger
Log | Files | Refs | Submodules | README | LICENSE

commit 5a51208c20daaf2c3d2c83d072d57157a799cbc8
parent 45394b9b4215ebe82ce621d2c7479696a8f4ac15
Author: Jacki <jacki@thejackimonster.de>
Date:   Thu, 26 Sep 2024 02:32:36 +0200

Adjust code to build with API changes

Signed-off-by: Jacki <jacki@thejackimonster.de>

Diffstat:
Msrc/account.c | 12++++++------
Msrc/application.c | 16++++++++--------
Msrc/application.h | 6+++---
Msrc/chat/messenger.c | 4++--
Msrc/discourse.c | 2+-
Msrc/event.c | 74+++++++++++++++++++++++++++++++++++++-------------------------------------
Msrc/event.h | 24++++++++++++------------
Msrc/ui/accounts.c | 10+++++-----
Msrc/ui/chat.c | 42+++++++++++++++++++++---------------------
Msrc/ui/contact_entry.c | 2+-
Msrc/ui/contact_entry.h | 4++--
Msrc/ui/contact_info.c | 18+++++++++---------
Msrc/ui/contact_info.h | 2+-
Msrc/ui/contacts.c | 2+-
Msrc/ui/discourse.c | 22+++++++++++-----------
Msrc/ui/invite_contact.c | 2+-
Msrc/ui/message.c | 26+++++++++++++-------------
Msrc/ui/message.h | 12++++++------
Msrc/ui/messenger.c | 40++++++++++++++++++++--------------------
19 files changed, 160 insertions(+), 160 deletions(-)

diff --git a/src/account.c b/src/account.c @@ -108,7 +108,7 @@ account_cleanup_infos() void account_add_name_avatar_to_info(const struct GNUNET_CHAT_Account *account, - HdyAvatar *avatar) + HdyAvatar *avatar) { g_assert(avatar); @@ -127,7 +127,7 @@ account_add_name_avatar_to_info(const struct GNUNET_CHAT_Account *account, void account_switch_name_avatar_to_info(const struct GNUNET_CHAT_Account *account, - HdyAvatar *avatar) + HdyAvatar *avatar) { g_assert(avatar); @@ -158,7 +158,7 @@ account_switch_name_avatar_to_info(const struct GNUNET_CHAT_Account *account, void account_remove_name_avatar_from_info(const struct GNUNET_CHAT_Account *account, - HdyAvatar *avatar) + HdyAvatar *avatar) { g_assert(avatar); @@ -237,7 +237,7 @@ skip_comparison: static enum GNUNET_GenericReturnValue _account_iterate_attribute(void *cls, - const struct GNUNET_CHAT_Account *account, + struct GNUNET_CHAT_Account *account, const char *name, const char *value) { @@ -290,12 +290,12 @@ account_update_attributes(const struct GNUNET_CHAT_Account *account, MESSENGER_AccountInfo *info = GNUNET_CHAT_account_get_user_pointer(account); - if (!info) + if ((!info) || (!(info->account))) return; GNUNET_CHAT_account_get_attributes( app->chat.messenger.handle, - account, + info->account, _account_iterate_attribute, app->chat.messenger.handle ); diff --git a/src/application.c b/src/application.c @@ -78,7 +78,7 @@ _application_accounts(gpointer user_data) static enum GNUNET_GenericReturnValue _application_select_account(void *cls, - const struct GNUNET_CHAT_Handle *handle, + struct GNUNET_CHAT_Handle *handle, struct GNUNET_CHAT_Account *account) { g_assert((cls) && (account)); @@ -126,7 +126,7 @@ _application_init(MESSENGER_Application *app) static void _application_activate(GApplication* application, - gpointer user_data) + gpointer user_data) { g_assert((application) && (user_data)); @@ -292,7 +292,7 @@ application_init(MESSENGER_Application *app, const gchar* application_get_resource_path(MESSENGER_Application *app, - const char *path) + const char *path) { g_assert((app) && (path)); @@ -517,7 +517,7 @@ _application_event_call(gpointer user_data) void application_call_event(MESSENGER_Application *app, - MESSENGER_ApplicationEvent event) + MESSENGER_ApplicationEvent event) { g_assert((app) && (event)); @@ -554,7 +554,7 @@ _application_sync_event_call(gpointer user_data) void application_call_sync_event(MESSENGER_Application *app, - MESSENGER_ApplicationEvent event) + MESSENGER_ApplicationEvent event) { g_assert((app) && (event)); @@ -580,7 +580,7 @@ typedef struct MESSENGER_ApplicationMessageEventCall MESSENGER_ApplicationMessageEvent event; struct GNUNET_CHAT_Context *context; - const struct GNUNET_CHAT_Message *message; + struct GNUNET_CHAT_Message *message; } MESSENGER_ApplicationMessageEventCall; static gboolean @@ -602,7 +602,7 @@ void application_call_message_event(MESSENGER_Application *app, MESSENGER_ApplicationMessageEvent event, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *message) + struct GNUNET_CHAT_Message *message) { g_assert((app) && (event) && (message)); @@ -668,7 +668,7 @@ _application_stop_chat(gpointer user_data) void application_exit(MESSENGER_Application *app, - MESSENGER_ApplicationSignal signal) + MESSENGER_ApplicationSignal signal) { g_assert(app); diff --git a/src/application.h b/src/application.h @@ -277,7 +277,7 @@ typedef void (*MESSENGER_ApplicationEvent) ( typedef void (*MESSENGER_ApplicationMessageEvent) ( MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg + struct GNUNET_CHAT_Message *msg ); /** @@ -300,7 +300,7 @@ application_call_event(MESSENGER_Application *app, */ void application_call_sync_event(MESSENGER_Application *app, - MESSENGER_ApplicationEvent event); + MESSENGER_ApplicationEvent event); /** * Calls a given message event with the messenger @@ -316,7 +316,7 @@ void application_call_message_event(MESSENGER_Application *app, MESSENGER_ApplicationMessageEvent event, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *message); + struct GNUNET_CHAT_Message *message); /** * Lock the thread of the GNUnet scheduler diff --git a/src/chat/messenger.c b/src/chat/messenger.c @@ -30,7 +30,7 @@ static int _chat_messenger_message(void *cls, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *message) + struct GNUNET_CHAT_Message *message) { g_assert((cls) && (message)); @@ -143,7 +143,7 @@ _chat_messenger_message(void *cls, } case GNUNET_CHAT_KIND_DELETION: { - const struct GNUNET_CHAT_Message *target; + struct GNUNET_CHAT_Message *target; target = GNUNET_CHAT_message_get_target(message); if (target) diff --git a/src/discourse.c b/src/discourse.c @@ -841,7 +841,7 @@ discourse_destroy_info(struct GNUNET_CHAT_Discourse *discourse) static enum GNUNET_GenericReturnValue _append_contact_to_subscription_list(void *cls, - const struct GNUNET_CHAT_Discourse *discourse, + struct GNUNET_CHAT_Discourse *discourse, struct GNUNET_CHAT_Contact *contact) { g_assert((cls) && (discourse) && (contact)); diff --git a/src/event.c b/src/event.c @@ -40,7 +40,7 @@ static void _close_notification(NotifyNotification* notification, - gpointer user_data) + gpointer user_data) { g_assert((notification) && (user_data)); @@ -97,8 +97,8 @@ _show_notification(MESSENGER_Application *app, void event_handle_warning(MESSENGER_Application *app, - struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Context *context, + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (msg)); @@ -122,7 +122,7 @@ event_handle_warning(MESSENGER_Application *app, static enum GNUNET_GenericReturnValue _iterate_reload_account(void *cls, - UNUSED const struct GNUNET_CHAT_Handle *handle, + UNUSED struct GNUNET_CHAT_Handle *handle, struct GNUNET_CHAT_Account *account) { g_assert((cls) && (account)); @@ -235,7 +235,7 @@ enqueue_chat_entry_update(UI_CHAT_ENTRY_Handle *entry) static void _add_new_chat_entry(MESSENGER_Application *app, - struct GNUNET_CHAT_Context *context) + struct GNUNET_CHAT_Context *context) { g_assert((app) && (context)); @@ -277,8 +277,8 @@ _add_new_chat_entry(MESSENGER_Application *app, static int _iterate_profile_contacts(void *cls, - UNUSED struct GNUNET_CHAT_Handle *handle, - struct GNUNET_CHAT_Contact *contact) + UNUSED struct GNUNET_CHAT_Handle *handle, + struct GNUNET_CHAT_Contact *contact) { g_assert((cls) && (contact)); @@ -297,8 +297,8 @@ _iterate_profile_contacts(void *cls, static int _iterate_profile_groups(void *cls, - UNUSED struct GNUNET_CHAT_Handle *handle, - UNUSED struct GNUNET_CHAT_Group *group) + UNUSED struct GNUNET_CHAT_Handle *handle, + UNUSED struct GNUNET_CHAT_Group *group) { g_assert(cls); @@ -360,7 +360,7 @@ event_update_profile(MESSENGER_Application *app) static void _clear_chat_entry(GtkWidget *widget, - gpointer user_data) + gpointer user_data) { g_assert((widget) && (user_data)); @@ -384,8 +384,8 @@ _clear_chat_entry(GtkWidget *widget, static int _cleanup_profile_contacts(void *cls, - UNUSED struct GNUNET_CHAT_Handle *handle, - struct GNUNET_CHAT_Contact *contact) + UNUSED struct GNUNET_CHAT_Handle *handle, + struct GNUNET_CHAT_Contact *contact) { if (contact) contact_destroy_info(contact); @@ -394,8 +394,8 @@ _cleanup_profile_contacts(void *cls, static int _cleanup_profile_files(void *cls, - UNUSED struct GNUNET_CHAT_Handle *handle, - struct GNUNET_CHAT_File *file) + UNUSED struct GNUNET_CHAT_Handle *handle, + struct GNUNET_CHAT_File *file) { if (file) file_destroy_info(file); @@ -428,14 +428,14 @@ event_cleanup_profile(MESSENGER_Application *app) void event_select_profile(MESSENGER_Application *app, - struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Context *context, + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (!context) && (msg)); CHAT_MESSENGER_Handle *chat = &(app->chat.messenger); - const struct GNUNET_CHAT_Account *account = GNUNET_CHAT_message_get_account(msg); + struct GNUNET_CHAT_Account *account = GNUNET_CHAT_message_get_account(msg); if (GNUNET_CHAT_KIND_CREATED_ACCOUNT == GNUNET_CHAT_message_get_kind(msg)) GNUNET_CHAT_connect(chat->handle, account); @@ -465,8 +465,8 @@ _delayed_context_drop(gpointer user_data) void event_update_chats(MESSENGER_Application *app, - struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Context *context, + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (context) && (msg)); @@ -526,8 +526,8 @@ _update_contact_context(struct GNUNET_CHAT_Contact *contact) void event_presence_contact(MESSENGER_Application *app, - struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Context *context, + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (context) && (msg)); @@ -612,8 +612,8 @@ event_presence_contact(MESSENGER_Application *app, void event_update_contacts(UNUSED MESSENGER_Application *app, - struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Context *context, + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (msg)); @@ -643,7 +643,7 @@ event_update_contacts(UNUSED MESSENGER_Application *app, static void _event_invitation_accept_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -670,7 +670,7 @@ _event_invitation_deny_click(UNUSED GtkButton *button, void event_invitation(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (context) && (msg)); @@ -699,11 +699,11 @@ event_invitation(MESSENGER_Application *app, UI_MESSAGE_Handle *message = ui_message_new(app, UI_MESSAGE_STATUS); ui_message_update(message, app, msg); - const struct GNUNET_CHAT_Contact *sender = GNUNET_CHAT_message_get_sender( + struct GNUNET_CHAT_Contact *sender = GNUNET_CHAT_message_get_sender( msg ); - const struct GNUNET_CHAT_Contact *recipient = GNUNET_CHAT_message_get_recipient( + struct GNUNET_CHAT_Contact *recipient = GNUNET_CHAT_message_get_recipient( msg ); @@ -754,7 +754,7 @@ event_invitation(MESSENGER_Application *app, void event_receive_message(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (context) && (msg)); @@ -801,7 +801,7 @@ event_receive_message(MESSENGER_Application *app, ui_message_update(message, app, msg); - const struct GNUNET_CHAT_Contact *contact = GNUNET_CHAT_message_get_sender( + struct GNUNET_CHAT_Contact *contact = GNUNET_CHAT_message_get_sender( msg ); @@ -837,11 +837,11 @@ skip_message: static void _event_update_tag_message_state(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Message *msg) { g_assert((msg) && (GNUNET_CHAT_KIND_TAG == GNUNET_CHAT_message_get_kind(msg))); - const struct GNUNET_CHAT_Message *target; + struct GNUNET_CHAT_Message *target; target = GNUNET_CHAT_message_get_target(msg); if (!target) @@ -886,7 +886,7 @@ _event_update_tag_message_state(MESSENGER_Application *app, void event_delete_message(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (context) && (msg)); @@ -924,13 +924,13 @@ event_delete_message(MESSENGER_Application *app, void event_tag_message(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (context) && (msg)); UI_CHAT_ENTRY_Handle *handle = GNUNET_CHAT_context_get_user_pointer(context); - const struct GNUNET_CHAT_Message *target = GNUNET_CHAT_message_get_target(msg); + struct GNUNET_CHAT_Message *target = GNUNET_CHAT_message_get_target(msg); _event_update_tag_message_state(app, context, msg); @@ -983,7 +983,7 @@ event_update_attributes(MESSENGER_Application *app) CHAT_MESSENGER_Handle *chat = &(app->chat.messenger); - const struct GNUNET_CHAT_Account *account = GNUNET_CHAT_get_connected( + struct GNUNET_CHAT_Account *account = GNUNET_CHAT_get_connected( chat->handle ); @@ -1000,7 +1000,7 @@ event_update_attributes(MESSENGER_Application *app) void event_discourse(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (context) && (msg)); @@ -1028,7 +1028,7 @@ event_discourse(MESSENGER_Application *app, void event_discourse_data(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg) + struct GNUNET_CHAT_Message *msg) { g_assert((app) && (context) && (msg)); diff --git a/src/event.h b/src/event.h @@ -40,7 +40,7 @@ void event_handle_warning(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Message *msg); /** * Event for the UI to be called whenever the accounts @@ -79,8 +79,8 @@ event_cleanup_profile(MESSENGER_Application *app); */ void event_select_profile(MESSENGER_Application *app, - struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Context *context, + struct GNUNET_CHAT_Message *msg); /** * Event for the UI to be called whenever a the user @@ -93,7 +93,7 @@ event_select_profile(MESSENGER_Application *app, void event_update_chats(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Message *msg); /** * Event for the UI to be called whenever a contact @@ -106,7 +106,7 @@ event_update_chats(MESSENGER_Application *app, void event_presence_contact(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Message *msg); /** * Event for the UI to be called whenever a contact @@ -120,7 +120,7 @@ event_presence_contact(MESSENGER_Application *app, void event_update_contacts(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Message *msg); /** * Event for the UI to be called whenever an invitation @@ -133,7 +133,7 @@ event_update_contacts(MESSENGER_Application *app, void event_invitation(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Message *msg); /** * Event for the UI to be called whenever a content @@ -147,7 +147,7 @@ event_invitation(MESSENGER_Application *app, void event_receive_message(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Message *msg); /** * Event for the UI to be called whenever a message @@ -160,7 +160,7 @@ event_receive_message(MESSENGER_Application *app, void event_delete_message(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Message *msg); /** * Event for the UI to be called whenever a message @@ -173,7 +173,7 @@ event_delete_message(MESSENGER_Application *app, void event_tag_message(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Message *msg); /** * Event for the UI to be called whenever an attribute @@ -195,7 +195,7 @@ event_update_attributes(MESSENGER_Application *app); void event_discourse(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Message *msg); /** * Event for the UI to be called whenever a data @@ -208,6 +208,6 @@ event_discourse(MESSENGER_Application *app, void event_discourse_data(MESSENGER_Application *app, struct GNUNET_CHAT_Context *context, - const struct GNUNET_CHAT_Message *msg); + struct GNUNET_CHAT_Message *msg); #endif /* EVENT_H_ */ diff --git a/src/ui/accounts.c b/src/ui/accounts.c @@ -32,7 +32,7 @@ static void handle_close_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -94,7 +94,7 @@ close_dialog: static void handle_dialog_destroy(UNUSED GtkWidget *window, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -111,7 +111,7 @@ handle_dialog_destroy(UNUSED GtkWidget *window, static int _iterate_accounts(void *cls, - UNUSED const struct GNUNET_CHAT_Handle *handle, + UNUSED struct GNUNET_CHAT_Handle *handle, struct GNUNET_CHAT_Account *account) { g_assert((cls) && (account)); @@ -141,7 +141,7 @@ _iterate_accounts(void *cls, void ui_accounts_dialog_init(MESSENGER_Application *app, - UI_ACCOUNTS_Handle *handle) + UI_ACCOUNTS_Handle *handle) { g_assert((app) && (handle)); @@ -230,7 +230,7 @@ _ui_accounts_cleanup_listbox(UI_ACCOUNTS_Handle *handle, void ui_accounts_dialog_refresh(MESSENGER_Application *app, - UI_ACCOUNTS_Handle *handle) + UI_ACCOUNTS_Handle *handle) { g_assert((app) && (handle)); diff --git a/src/ui/chat.c b/src/ui/chat.c @@ -112,7 +112,7 @@ _flap_chat_details_reveal_switch(gpointer user_data) static void handle_chat_details_via_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -177,8 +177,8 @@ handle_chat_contacts_listbox_row_activated(GtkListBox *listbox, static void handle_chat_messages_listbox_size_allocate(UNUSED GtkWidget *widget, - UNUSED GdkRectangle *allocation, - gpointer user_data) + UNUSED GdkRectangle *allocation, + gpointer user_data) { g_assert(user_data); @@ -202,7 +202,7 @@ handle_chat_messages_listbox_size_allocate(UNUSED GtkWidget *widget, static void handle_reveal_identity_button_click(GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert((button) && (user_data)); @@ -230,7 +230,7 @@ handle_reveal_identity_button_click(GtkButton *button, static void handle_discourse_button_click(GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert((button) && (user_data)); @@ -291,7 +291,7 @@ handle_unblock_button_click(UNUSED GtkButton *button, static void handle_leave_chat_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -366,7 +366,7 @@ struct FilterTags static enum GNUNET_GenericReturnValue _iterate_message_tags(void *cls, - const struct GNUNET_CHAT_Message *message) + struct GNUNET_CHAT_Message *message) { g_assert((cls) && (message)); @@ -456,7 +456,7 @@ handle_chat_messages_filter(GtkListBoxRow *row, static void handle_chat_messages_selected_rows_changed(GtkListBox *listbox, - gpointer user_data) + gpointer user_data) { g_assert((listbox) && (user_data)); @@ -490,7 +490,7 @@ handle_chat_messages_selected_rows_changed(GtkListBox *listbox, static void handle_attach_file_button_click(GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert((button) && (user_data)); @@ -567,7 +567,7 @@ _update_send_record_symbol(GtkTextBuffer *buffer, static void handle_send_text_buffer_changed(GtkTextBuffer *buffer, - gpointer user_data) + gpointer user_data) { g_assert((buffer) && (user_data)); @@ -582,8 +582,8 @@ handle_send_text_buffer_changed(GtkTextBuffer *buffer, static gboolean _send_text_from_view(MESSENGER_Application *app, - UI_CHAT_Handle *handle, - GtkTextView *text_view, + UI_CHAT_Handle *handle, + GtkTextView *text_view, gint64 action_time) { g_assert((app) && (handle) && (text_view)); @@ -669,7 +669,7 @@ handle_sending_recording_upload_file(UNUSED void *cls, static void handle_send_record_button_click(GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert((button) && (user_data)); @@ -724,7 +724,7 @@ handle_send_record_button_click(GtkButton *button, static void handle_send_later_button_click(GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert((button) && (user_data)); @@ -747,7 +747,7 @@ handle_send_later_button_click(GtkButton *button, static void handle_send_now_button_click(GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert((button) && (user_data)); @@ -927,7 +927,7 @@ handle_send_record_button_released(GtkWidget *widget, static gboolean handle_send_text_key_press (GtkWidget *widget, GdkEventKey *event, - gpointer user_data) + gpointer user_data) { g_assert((widget) && (event) && (user_data)); @@ -947,7 +947,7 @@ handle_send_text_key_press (GtkWidget *widget, static void handle_recording_close_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -958,7 +958,7 @@ handle_recording_close_button_click(UNUSED GtkButton *button, static void _stop_playing_recording(UI_CHAT_Handle *handle, - gboolean reset_bar) + gboolean reset_bar) { g_assert(handle); @@ -985,7 +985,7 @@ _stop_playing_recording(UI_CHAT_Handle *handle, static void handle_recording_play_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -1034,7 +1034,7 @@ handle_search_entry_search_changed(UNUSED GtkSearchEntry* search_entry, static void handle_picker_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -1660,7 +1660,7 @@ struct IterateChatClosure { static enum GNUNET_GenericReturnValue iterate_ui_chat_update_group_contacts(void *cls, - UNUSED const struct GNUNET_CHAT_Group *group, + UNUSED struct GNUNET_CHAT_Group *group, struct GNUNET_CHAT_Contact *contact) { struct IterateChatClosure *closure = ( diff --git a/src/ui/contact_entry.c b/src/ui/contact_entry.c @@ -62,7 +62,7 @@ ui_contact_entry_new(MESSENGER_Application *app) void ui_contact_entry_set_contact(UI_CONTACT_ENTRY_Handle* handle, - const struct GNUNET_CHAT_Contact *contact) + struct GNUNET_CHAT_Contact *contact) { g_assert(handle); diff --git a/src/ui/contact_entry.h b/src/ui/contact_entry.h @@ -31,7 +31,7 @@ typedef struct UI_CONTACT_ENTRY_Handle { - const struct GNUNET_CHAT_Contact *contact; + struct GNUNET_CHAT_Contact *contact; GtkBuilder *builder; @@ -63,7 +63,7 @@ ui_contact_entry_new(MESSENGER_Application *app); */ void ui_contact_entry_set_contact(UI_CONTACT_ENTRY_Handle* handle, - const struct GNUNET_CHAT_Contact *contact); + struct GNUNET_CHAT_Contact *contact); /** * Frees its resources and destroys a given diff --git a/src/ui/contact_info.c b/src/ui/contact_info.c @@ -39,7 +39,7 @@ static void handle_contact_edit_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -94,7 +94,7 @@ skip_change_name: static void handle_contact_name_entry_activate(UNUSED GtkEntry *entry, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -308,7 +308,7 @@ handle_unblock_button_click(UNUSED GtkButton *button, static void handle_open_chat_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -353,7 +353,7 @@ close_dialog: static void handle_back_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -677,7 +677,7 @@ cb_contact_info_shared_attributes(void *cls, static enum GNUNET_GenericReturnValue cb_contact_info_contact_tags(void *cls, - const struct GNUNET_CHAT_Contact *contact, + struct GNUNET_CHAT_Contact *contact, const char *tag) { g_assert((cls) && (contact) && (tag)); @@ -824,7 +824,7 @@ handle_add_attribute_button_click(UNUSED GtkButton *button, static void handle_attribute_entry_activate(UNUSED GtkEntry *entry, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -981,7 +981,7 @@ handle_remove_tag_button_click(UNUSED GtkButton *button, static void handle_tag_entry_activate(UNUSED GtkEntry *entry, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -1377,7 +1377,7 @@ _contact_info_update(UI_CONTACT_INFO_Handle *handle, static void _account_info_update(UI_CONTACT_INFO_Handle *handle, - const struct GNUNET_CHAT_Account *account) + struct GNUNET_CHAT_Account *account) { g_assert(handle); @@ -1408,7 +1408,7 @@ ui_contact_info_dialog_update(UI_CONTACT_INFO_Handle *handle, _contact_info_update(handle, contact); else { - const struct GNUNET_CHAT_Account *account = GNUNET_CHAT_get_connected( + struct GNUNET_CHAT_Account *account = GNUNET_CHAT_get_connected( handle->app->chat.messenger.handle ); diff --git a/src/ui/contact_info.h b/src/ui/contact_info.h @@ -36,7 +36,7 @@ typedef struct UI_CONTACT_INFO_Handle { MESSENGER_Application *app; - const struct GNUNET_CHAT_Account *account; + struct GNUNET_CHAT_Account *account; struct GNUNET_CHAT_Contact *contact; GtkBuilder *builder; diff --git a/src/ui/contacts.c b/src/ui/contacts.c @@ -109,7 +109,7 @@ struct FilterTags static enum GNUNET_GenericReturnValue _iterate_contact_tags(void *cls, - const struct GNUNET_CHAT_Contact *contact, + struct GNUNET_CHAT_Contact *contact, const char *tag) { g_assert((cls) && (contact) && (tag)); diff --git a/src/ui/discourse.c b/src/ui/discourse.c @@ -42,7 +42,7 @@ static void handle_back_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -52,7 +52,7 @@ handle_back_button_click(UNUSED GtkButton *button, static void handle_details_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -92,7 +92,7 @@ _update_microphone_icon(UI_DISCOURSE_Handle *handle) static void handle_microphone_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -284,7 +284,7 @@ _update_call_button(UI_DISCOURSE_Handle *handle) static void handle_call_start_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -309,7 +309,7 @@ handle_call_start_button_click(UNUSED GtkButton *button, static void handle_call_stop_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -341,7 +341,7 @@ handle_call_stop_button_click(UNUSED GtkButton *button, static void handle_window_destroy(UNUSED GtkWidget *window, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -545,7 +545,7 @@ ui_discourse_window_init(MESSENGER_Application *app, static enum GNUNET_GenericReturnValue append_discourse_members_to_list(void *cls, - UNUSED const struct GNUNET_CHAT_Discourse *discourse, + UNUSED struct GNUNET_CHAT_Discourse *discourse, struct GNUNET_CHAT_Contact *contact) { g_assert((cls) && (contact)); @@ -573,7 +573,7 @@ append_discourses_members(void *cls, static enum GNUNET_GenericReturnValue append_group_contacts(void *cls, - UNUSED const struct GNUNET_CHAT_Group *group, + UNUSED struct GNUNET_CHAT_Group *group, struct GNUNET_CHAT_Contact *contact) { g_assert((cls) && (contact)); @@ -591,7 +591,7 @@ struct IterateDiscourseClosure { static enum GNUNET_GenericReturnValue iterate_ui_discourse_update_discourse_members(void *cls, - const struct GNUNET_CHAT_Discourse *discourse, + struct GNUNET_CHAT_Discourse *discourse, struct GNUNET_CHAT_Contact *contact) { struct IterateDiscourseClosure *closure = ( @@ -651,7 +651,7 @@ struct IterateDiscourseVideoClosure { static enum GNUNET_GenericReturnValue iterate_ui_discourse_update_discourse_video(void *cls, - const struct GNUNET_CHAT_Discourse *discourse, + struct GNUNET_CHAT_Discourse *discourse, struct GNUNET_CHAT_Contact *contact) { g_assert((cls) && (discourse) && (contact)); @@ -757,7 +757,7 @@ _discourse_update_members(UI_DISCOURSE_Handle *handle) static enum GNUNET_GenericReturnValue iterate_ui_discourse_update_group_contacts(void *cls, - UNUSED const struct GNUNET_CHAT_Group *group, + UNUSED struct GNUNET_CHAT_Group *group, struct GNUNET_CHAT_Contact *contact) { struct IterateDiscourseClosure *closure = ( diff --git a/src/ui/invite_contact.c b/src/ui/invite_contact.c @@ -69,7 +69,7 @@ handle_contacts_listbox_row_activated(GtkListBox* listbox, if (!context) goto close_dialog; - const struct GNUNET_CHAT_Group *group = GNUNET_CHAT_context_get_group( + struct GNUNET_CHAT_Group *group = GNUNET_CHAT_context_get_group( context ); diff --git a/src/ui/message.c b/src/ui/message.c @@ -52,7 +52,7 @@ handle_downloading_file(void *cls, static void handle_file_button_click(GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert((button) && (user_data)); @@ -139,7 +139,7 @@ handle_file_button_click(GtkButton *button, static void handle_media_button_click(GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert((button) && (user_data)); @@ -254,7 +254,7 @@ handle_preview_drawing_area_draw(GtkWidget* drawing_area, UI_MESSAGE_Handle* ui_message_new(MESSENGER_Application *app, - UI_MESSAGE_Type type) + UI_MESSAGE_Type type) { g_assert(app); @@ -445,8 +445,8 @@ ui_message_new(MESSENGER_Application *app, static int _iterate_read_receipts(void *cls, - UNUSED const struct GNUNET_CHAT_Message *message, - const struct GNUNET_CHAT_Contact *contact, + UNUSED struct GNUNET_CHAT_Message *message, + struct GNUNET_CHAT_Contact *contact, int read_receipt) { g_assert((cls) && (message) && (contact)); @@ -503,7 +503,7 @@ _message_media_supports_file_extension(const gchar *filename) static void _update_invitation_message(UI_MESSAGE_Handle *handle, - MESSENGER_Application *app, + MESSENGER_Application *app, struct GNUNET_CHAT_Invitation *invitation) { g_assert((handle) && (app) && (invitation)); @@ -567,8 +567,8 @@ _update_message_with_file(UI_MESSAGE_Handle *handle, static void _update_file_message(UI_MESSAGE_Handle *handle, - MESSENGER_Application *app, - struct GNUNET_CHAT_File *file) + MESSENGER_Application *app, + struct GNUNET_CHAT_File *file) { g_assert((handle) && (app) && (file)); @@ -682,8 +682,8 @@ file_content: void ui_message_update(UI_MESSAGE_Handle *handle, - MESSENGER_Application *app, - const struct GNUNET_CHAT_Message *msg) + MESSENGER_Application *app, + struct GNUNET_CHAT_Message *msg) { g_assert((handle) && (app)); @@ -730,7 +730,7 @@ ui_message_update(UI_MESSAGE_Handle *handle, void ui_message_set_contact(UI_MESSAGE_Handle *handle, - const struct GNUNET_CHAT_Contact *contact) + struct GNUNET_CHAT_Contact *contact) { g_assert(handle); @@ -754,7 +754,7 @@ ui_message_set_contact(UI_MESSAGE_Handle *handle, void ui_message_add_tag(UI_MESSAGE_Handle *handle, MESSENGER_Application *app, - const struct GNUNET_CHAT_Message *tag_message) + struct GNUNET_CHAT_Message *tag_message) { g_assert((handle) && (app) && (tag_message)); @@ -805,7 +805,7 @@ _remove_tag_from_message(UI_MESSAGE_Handle *handle, void ui_message_remove_tag(UI_MESSAGE_Handle *handle, MESSENGER_Application *app, - const struct GNUNET_CHAT_Message *tag_message) + struct GNUNET_CHAT_Message *tag_message) { g_assert((handle) && (app) && (tag_message)); diff --git a/src/ui/message.h b/src/ui/message.h @@ -46,8 +46,8 @@ typedef struct UI_MESSAGE_Handle UI_MESSAGE_Type type; struct GNUNET_TIME_Absolute timestamp; - const struct GNUNET_CHAT_Message *msg; - const struct GNUNET_CHAT_Contact *contact; + struct GNUNET_CHAT_Message *msg; + struct GNUNET_CHAT_Contact *contact; GtkBuilder *builder [2]; GtkWidget *message_box; @@ -121,7 +121,7 @@ ui_message_refresh(UI_MESSAGE_Handle *handle); void ui_message_update(UI_MESSAGE_Handle *handle, MESSENGER_Application *app, - const struct GNUNET_CHAT_Message *message); + struct GNUNET_CHAT_Message *message); /** * Sets the contact of a given message handle @@ -132,7 +132,7 @@ ui_message_update(UI_MESSAGE_Handle *handle, */ void ui_message_set_contact(UI_MESSAGE_Handle *handle, - const struct GNUNET_CHAT_Contact *contact); + struct GNUNET_CHAT_Contact *contact); /** * Adds a widget to represent a given tag message @@ -145,7 +145,7 @@ ui_message_set_contact(UI_MESSAGE_Handle *handle, void ui_message_add_tag(UI_MESSAGE_Handle *handle, MESSENGER_Application *app, - const struct GNUNET_CHAT_Message *tag_message); + struct GNUNET_CHAT_Message *tag_message); /** * Remove a widget representing a given tag message @@ -158,7 +158,7 @@ ui_message_add_tag(UI_MESSAGE_Handle *handle, void ui_message_remove_tag(UI_MESSAGE_Handle *handle, MESSENGER_Application *app, - const struct GNUNET_CHAT_Message *tag_message); + struct GNUNET_CHAT_Message *tag_message); /** * Frees its resources and destroys a given diff --git a/src/ui/messenger.c b/src/ui/messenger.c @@ -86,7 +86,7 @@ handle_user_details_folded(GObject* object, static void handle_profile_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -122,7 +122,7 @@ _flap_user_details_reveal_switch(gpointer user_data) static void handle_user_details_via_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -138,7 +138,7 @@ handle_user_details_via_button_click(UNUSED GtkButton* button, static void handle_lobby_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -153,7 +153,7 @@ handle_lobby_button_click(UNUSED GtkButton* button, static void _switch_details_revealer_visibility(UI_MESSENGER_Handle *handle, - gboolean state) + gboolean state) { g_assert(handle); @@ -172,7 +172,7 @@ _switch_details_revealer_visibility(UI_MESSENGER_Handle *handle, static void handle_account_details_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -233,7 +233,7 @@ handle_accounts_listbox_row_activated(UNUSED GtkListBox* listbox, static void handle_new_contact_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -246,7 +246,7 @@ handle_new_contact_button_click(UNUSED GtkButton* button, static void handle_new_group_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -259,7 +259,7 @@ handle_new_group_button_click(UNUSED GtkButton* button, static void handle_new_platform_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -272,7 +272,7 @@ handle_new_platform_button_click(UNUSED GtkButton* button, static void handle_contacts_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -285,7 +285,7 @@ handle_contacts_button_click(UNUSED GtkButton* button, static void handle_settings_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -298,7 +298,7 @@ handle_settings_button_click(UNUSED GtkButton* button, static void handle_about_button_click(UNUSED GtkButton* button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -378,7 +378,7 @@ handle_chats_listbox_sort_func(GtkListBoxRow* row0, static gboolean handle_chats_listbox_filter_func(GtkListBoxRow *row, - gpointer user_data) + gpointer user_data) { g_assert((row) && (user_data)); @@ -412,7 +412,7 @@ handle_chats_listbox_filter_func(GtkListBoxRow *row, static void handle_search_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -429,7 +429,7 @@ handle_search_button_click(UNUSED GtkButton *button, static void handle_chats_search_changed(UNUSED GtkSearchEntry *search, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -440,7 +440,7 @@ handle_chats_search_changed(UNUSED GtkSearchEntry *search, static void handle_main_window_destroy(UNUSED GtkWidget *window, - gpointer user_data) + gpointer user_data) { g_assert(user_data); @@ -462,7 +462,7 @@ handle_main_window_destroy(UNUSED GtkWidget *window, void ui_messenger_init(MESSENGER_Application *app, - UI_MESSENGER_Handle *handle) + UI_MESSENGER_Handle *handle) { g_assert((app) && (handle)); @@ -823,7 +823,7 @@ ui_messenger_init(MESSENGER_Application *app, static int _messenger_iterate_accounts(void *cls, - const struct GNUNET_CHAT_Handle *handle, + struct GNUNET_CHAT_Handle *handle, struct GNUNET_CHAT_Account *account) { g_assert((cls) && (handle) && (account)); @@ -850,7 +850,7 @@ _messenger_iterate_accounts(void *cls, static void _clear_accounts_listbox(GtkWidget *widget, - gpointer data) + gpointer data) { g_assert((widget) && (data)); @@ -879,7 +879,7 @@ _close_messenger_missing_account(gpointer data) void ui_messenger_refresh(MESSENGER_Application *app, - UI_MESSENGER_Handle *handle) + UI_MESSENGER_Handle *handle) { g_assert((app) && (handle)); @@ -915,7 +915,7 @@ ui_messenger_refresh(MESSENGER_Application *app, gboolean ui_messenger_is_context_active(UI_MESSENGER_Handle *handle, - struct GNUNET_CHAT_Context *context) + struct GNUNET_CHAT_Context *context) { g_assert((handle) && (context));