From 17392fe6169d39a75645728f44aa117f67b5331d Mon Sep 17 00:00:00 2001 From: Jacki Date: Wed, 14 Feb 2024 13:44:06 +0100 Subject: Add asserts to verify reliability Signed-off-by: Jacki --- src/ui/invite_contact.c | 125 +++++++++++++++++++++++++++--------------------- 1 file changed, 70 insertions(+), 55 deletions(-) (limited to 'src/ui/invite_contact.c') diff --git a/src/ui/invite_contact.c b/src/ui/invite_contact.c index 8d410bc..7ebf03e 100644 --- a/src/ui/invite_contact.c +++ b/src/ui/invite_contact.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - Copyright (C) 2021--2022 GNUnet e.V. + Copyright (C) 2021--2024 GNUnet e.V. GNUnet is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published @@ -24,31 +24,34 @@ #include "invite_contact.h" -#include "chat_entry.h" #include "contact_entry.h" #include "../application.h" static void handle_close_button_click(UNUSED GtkButton *button, - gpointer user_data) + gpointer user_data) { + g_assert(user_data); + GtkDialog *dialog = GTK_DIALOG(user_data); gtk_window_close(GTK_WINDOW(dialog)); } static void handle_contacts_listbox_row_activated(GtkListBox* listbox, - GtkListBoxRow* row, - gpointer user_data) + GtkListBoxRow* row, + gpointer user_data) { + g_assert((listbox) && (row) && (user_data)); + MESSENGER_Application *app = (MESSENGER_Application*) user_data; GtkTextView *text_view = GTK_TEXT_VIEW( - g_object_get_qdata(G_OBJECT(listbox), app->quarks.widget) + g_object_get_qdata(G_OBJECT(listbox), app->quarks.widget) ); struct GNUNET_CHAT_Contact *contact = (struct GNUNET_CHAT_Contact*) ( - g_object_get_qdata(G_OBJECT(row), app->quarks.data) + g_object_get_qdata(G_OBJECT(row), app->quarks.data) ); if ((!contact) || (!GNUNET_CHAT_contact_get_key(contact)) || @@ -57,14 +60,14 @@ handle_contacts_listbox_row_activated(GtkListBox* listbox, goto close_dialog; struct GNUNET_CHAT_Context *context = (struct GNUNET_CHAT_Context*) ( - g_object_get_qdata(G_OBJECT(text_view), app->quarks.data) + g_object_get_qdata(G_OBJECT(text_view), app->quarks.data) ); if (!context) goto close_dialog; const struct GNUNET_CHAT_Group *group = GNUNET_CHAT_context_get_group( - context + context ); if (group) @@ -76,22 +79,24 @@ close_dialog: static gboolean handle_contacts_listbox_filter_func(GtkListBoxRow *row, - gpointer user_data) + gpointer user_data) { + g_assert((row) && (user_data)); + MESSENGER_Application *app = (MESSENGER_Application*) user_data; - if ((!row) || (!gtk_list_box_row_get_selectable(row))) + if (!gtk_list_box_row_get_selectable(row)) return TRUE; const gchar *filter = gtk_entry_get_text( - GTK_ENTRY(app->ui.invite_contact.contact_search_entry) + GTK_ENTRY(app->ui.invite_contact.contact_search_entry) ); if (!filter) return TRUE; UI_CONTACT_ENTRY_Handle *entry = (UI_CONTACT_ENTRY_Handle*) ( - g_object_get_qdata(G_OBJECT(row), app->quarks.ui) + g_object_get_qdata(G_OBJECT(row), app->quarks.ui) ); if (!entry) @@ -107,8 +112,10 @@ handle_contacts_listbox_filter_func(GtkListBoxRow *row, static void handle_contact_search_entry_search_changed(UNUSED GtkSearchEntry* search_entry, - gpointer user_data) + gpointer user_data) { + g_assert(user_data); + GtkListBox *listbox = GTK_LIST_BOX(user_data); gtk_list_box_invalidate_filter(listbox); @@ -116,16 +123,20 @@ handle_contact_search_entry_search_changed(UNUSED GtkSearchEntry* search_entry, static void handle_dialog_destroy(UNUSED GtkWidget *window, - gpointer user_data) + gpointer user_data) { + g_assert(user_data); + ui_contacts_dialog_cleanup((UI_CONTACTS_Handle*) user_data); } static int _iterate_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)); + if (GNUNET_YES == GNUNET_CHAT_contact_is_owned(contact)) return GNUNET_YES; @@ -135,21 +146,21 @@ _iterate_contacts(void *cls, ui_contact_entry_set_contact(entry, contact); gtk_list_box_prepend( - app->ui.invite_contact.contacts_listbox, - entry->entry_box + app->ui.invite_contact.contacts_listbox, + entry->entry_box ); GtkListBoxRow *row = GTK_LIST_BOX_ROW( - gtk_widget_get_parent(entry->entry_box) + gtk_widget_get_parent(entry->entry_box) ); g_object_set_qdata(G_OBJECT(row), app->quarks.data, contact); g_object_set_qdata_full( - G_OBJECT(row), - app->quarks.ui, - entry, - (GDestroyNotify) ui_contact_entry_delete + G_OBJECT(row), + app->quarks.ui, + entry, + (GDestroyNotify) ui_contact_entry_delete ); return GNUNET_YES; @@ -157,72 +168,74 @@ _iterate_contacts(void *cls, void ui_invite_contact_dialog_init(MESSENGER_Application *app, - UI_INVITE_CONTACT_Handle *handle) + UI_INVITE_CONTACT_Handle *handle) { + g_assert((app) && (handle)); + handle->builder = gtk_builder_new_from_resource( - application_get_resource_path(app, "ui/invite_contact.ui") + application_get_resource_path(app, "ui/invite_contact.ui") ); handle->dialog = GTK_DIALOG( - gtk_builder_get_object(handle->builder, "invite_contact_dialog") + gtk_builder_get_object(handle->builder, "invite_contact_dialog") ); gtk_window_set_transient_for( - GTK_WINDOW(handle->dialog), - GTK_WINDOW(app->ui.messenger.main_window) + GTK_WINDOW(handle->dialog), + GTK_WINDOW(app->ui.messenger.main_window) ); handle->contact_search_entry = GTK_SEARCH_ENTRY( - gtk_builder_get_object(handle->builder, "contact_search_entry") + gtk_builder_get_object(handle->builder, "contact_search_entry") ); handle->contacts_listbox = GTK_LIST_BOX( - gtk_builder_get_object(handle->builder, "contacts_listbox") + gtk_builder_get_object(handle->builder, "contacts_listbox") ); gtk_list_box_set_filter_func( - handle->contacts_listbox, - handle_contacts_listbox_filter_func, - app, - NULL + handle->contacts_listbox, + handle_contacts_listbox_filter_func, + app, + NULL ); g_signal_connect( - handle->contact_search_entry, - "search-changed", - G_CALLBACK(handle_contact_search_entry_search_changed), - handle->contacts_listbox + handle->contact_search_entry, + "search-changed", + G_CALLBACK(handle_contact_search_entry_search_changed), + handle->contacts_listbox ); g_signal_connect( - handle->contacts_listbox, - "row-activated", - G_CALLBACK(handle_contacts_listbox_row_activated), - app + handle->contacts_listbox, + "row-activated", + G_CALLBACK(handle_contacts_listbox_row_activated), + app ); handle->close_button = GTK_BUTTON( - gtk_builder_get_object(handle->builder, "close_button") + gtk_builder_get_object(handle->builder, "close_button") ); g_signal_connect( - handle->close_button, - "clicked", - G_CALLBACK(handle_close_button_click), - handle->dialog + handle->close_button, + "clicked", + G_CALLBACK(handle_close_button_click), + handle->dialog ); g_signal_connect( - handle->dialog, - "destroy", - G_CALLBACK(handle_dialog_destroy), - handle + handle->dialog, + "destroy", + G_CALLBACK(handle_dialog_destroy), + handle ); GNUNET_CHAT_iterate_contacts( - app->chat.messenger.handle, - _iterate_contacts, - app + app->chat.messenger.handle, + _iterate_contacts, + app ); gtk_list_box_invalidate_filter(handle->contacts_listbox); @@ -231,6 +244,8 @@ ui_invite_contact_dialog_init(MESSENGER_Application *app, void ui_invite_contact_dialog_cleanup(UI_INVITE_CONTACT_Handle *handle) { + g_assert(handle); + g_object_unref(handle->builder); memset(handle, 0, sizeof(*handle)); -- cgit v1.2.3