From 0f0b27448c72b979b7153aa83647612f335995ce Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Thu, 20 Aug 2020 00:31:03 +0200 Subject: Used the new macro used to provide callbacks to GtkBuilder everywhere. --- src/gtkext/gtkbufferdisplay.c | 9 +++++---- src/gui/dialogs/bookmark.c | 3 ++- src/gui/dialogs/export_graph.c | 11 ++++++----- src/gui/dialogs/identity.c | 3 ++- src/gui/dialogs/loading.c | 11 ++++++----- src/gui/dialogs/preferences.c | 5 +++-- src/gui/dialogs/prefs_labels.c | 2 +- src/gui/dialogs/snapshots.c | 21 ++++++++++++--------- src/gui/dialogs/storage.c | 9 ++++++--- src/gui/panels/bintree.c | 11 ++++++----- src/gui/panels/errors.c | 9 +++++---- src/gui/panels/glance.c | 11 ++++++----- src/gui/panels/history.c | 9 +++++---- src/gui/panels/regedit.c | 10 +++++----- src/gui/panels/strings.c | 6 +++--- src/gui/panels/symbols.c | 12 ++++++------ src/gui/panels/welcome.c | 13 +++++++------ 17 files changed, 86 insertions(+), 69 deletions(-) diff --git a/src/gtkext/gtkbufferdisplay.c b/src/gtkext/gtkbufferdisplay.c index e419125..4566cc5 100644 --- a/src/gtkext/gtkbufferdisplay.c +++ b/src/gtkext/gtkbufferdisplay.c @@ -27,6 +27,7 @@ #include +#include "easygtk.h" #include "gtkbufferdisplay-int.h" #include "../core/params.h" #include "../glibext/gbinarycursor.h" // REMME @@ -1304,10 +1305,10 @@ void gtk_buffer_display_add_block_bar(GtkBufferDisplay *display) gtk_fixed_put(GTK_FIXED(display), bar, 0, 0); gtk_builder_add_callback_symbols(display->builder, - "on_block_bar_enter_notify", G_CALLBACK(on_block_bar_enter_notify), - "on_block_bar_leave_notify", G_CALLBACK(on_block_bar_leave_notify), - "on_block_bar_collapsing_enter", G_CALLBACK(on_block_bar_collapsing_enter), - "on_block_bar_collapsing_leave", G_CALLBACK(on_block_bar_collapsing_leave), + BUILDER_CALLBACK(on_block_bar_enter_notify), + BUILDER_CALLBACK(on_block_bar_leave_notify), + BUILDER_CALLBACK(on_block_bar_collapsing_enter), + BUILDER_CALLBACK(on_block_bar_collapsing_leave), NULL); gtk_builder_connect_signals(display->builder, display); diff --git a/src/gui/dialogs/bookmark.c b/src/gui/dialogs/bookmark.c index 8762691..46e1e62 100644 --- a/src/gui/dialogs/bookmark.c +++ b/src/gui/dialogs/bookmark.c @@ -25,6 +25,7 @@ #include "../../analysis/db/items/bookmark.h" +#include "../../gtkext/easygtk.h" @@ -61,7 +62,7 @@ GtkWidget *create_bookmark_dialog(GtkWindow *parent, GtkBuilder **outb) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "validate_address", G_CALLBACK(validate_address), + BUILDER_CALLBACK(validate_address), NULL); gtk_builder_connect_signals(builder, result); diff --git a/src/gui/dialogs/export_graph.c b/src/gui/dialogs/export_graph.c index 0af0203..160eaf2 100644 --- a/src/gui/dialogs/export_graph.c +++ b/src/gui/dialogs/export_graph.c @@ -38,6 +38,7 @@ #include "../../core/logs.h" #include "../../glibext/gbinarycursor.h" #include "../../glibext/gloadedpanel.h" +#include "../../gtkext/easygtk.h" #include "../../gtkext/gtkdisplaypanel.h" @@ -153,11 +154,11 @@ void run_graph_export_assistant(GLoadedBinary *binary, GtkGraphDisplay *display, /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "graph_export_assistant_cancel", G_CALLBACK(graph_export_assistant_cancel), - "graph_export_assistant_close", G_CALLBACK(graph_export_assistant_close), - "on_output_format_toggled", G_CALLBACK(on_output_format_toggled), - "on_output_filename_changed", G_CALLBACK(on_output_filename_changed), - "on_output_filename_selection", G_CALLBACK(on_output_filename_selection), + BUILDER_CALLBACK(graph_export_assistant_cancel), + BUILDER_CALLBACK(graph_export_assistant_close), + BUILDER_CALLBACK(on_output_format_toggled), + BUILDER_CALLBACK(on_output_filename_changed), + BUILDER_CALLBACK(on_output_filename_selection), NULL); gtk_builder_connect_signals(builder, builder); diff --git a/src/gui/dialogs/identity.c b/src/gui/dialogs/identity.c index 43449f0..92bbb62 100644 --- a/src/gui/dialogs/identity.c +++ b/src/gui/dialogs/identity.c @@ -35,6 +35,7 @@ #include "../../analysis/db/certs.h" #include "../../common/extstr.h" #include "../../core/logs.h" +#include "../../gtkext/easygtk.h" @@ -137,7 +138,7 @@ GtkWidget *create_identity_dialog(GtkWindow *parent, GtkBuilder **outb) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "update_identity", G_CALLBACK(update_identity), + BUILDER_CALLBACK(update_identity), NULL); gtk_builder_connect_signals(builder, builder); diff --git a/src/gui/dialogs/loading.c b/src/gui/dialogs/loading.c index 97cd892..912eb8d 100644 --- a/src/gui/dialogs/loading.c +++ b/src/gui/dialogs/loading.c @@ -35,6 +35,7 @@ #include "../../analysis/binary.h" #include "../../core/processors.h" +#include "../../gtkext/easygtk.h" @@ -104,11 +105,11 @@ GtkWidget *create_loading_dialog(GtkWindow *parent, GtkBuilder **outb) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "on_loaded_selection_changed", G_CALLBACK(on_loaded_selection_changed), - "on_load_mode_toggled", G_CALLBACK(on_load_mode_toggled), - "on_key_press_event", G_CALLBACK(on_key_press_event), - "on_cancel_clicked", G_CALLBACK(on_cancel_clicked), - "on_validate_clicked", G_CALLBACK(on_validate_clicked), + BUILDER_CALLBACK(on_loaded_selection_changed), + BUILDER_CALLBACK(on_load_mode_toggled), + BUILDER_CALLBACK(on_key_press_event), + BUILDER_CALLBACK(on_cancel_clicked), + BUILDER_CALLBACK(on_validate_clicked), NULL); gtk_builder_connect_signals(builder, builder); diff --git a/src/gui/dialogs/preferences.c b/src/gui/dialogs/preferences.c index 3f58866..4a3fb7c 100644 --- a/src/gui/dialogs/preferences.c +++ b/src/gui/dialogs/preferences.c @@ -30,6 +30,7 @@ #include "prefs_fgraph.h" #include "prefs_labels.h" #include "../../core/params.h" +#include "../../gtkext/easygtk.h" @@ -237,8 +238,8 @@ GtkWidget *create_preferences_dialog(GtkWindow *parent, GtkBuilder **outb) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "on_prefs_selection_changed", G_CALLBACK(on_prefs_selection_changed), - "on_prefs_apply_button_clicked", G_CALLBACK(on_prefs_apply_button_clicked), + BUILDER_CALLBACK(on_prefs_selection_changed), + BUILDER_CALLBACK(on_prefs_apply_button_clicked), NULL); gtk_builder_connect_signals(builder, builder); diff --git a/src/gui/dialogs/prefs_labels.c b/src/gui/dialogs/prefs_labels.c index 51d012c..30505a4 100644 --- a/src/gui/dialogs/prefs_labels.c +++ b/src/gui/dialogs/prefs_labels.c @@ -53,7 +53,7 @@ GtkWidget *create_labels_preferences(GtkBuilder **builder) /* gtk_builder_add_callback_symbols(builder, - "update_preferences", G_CALLBACK(update_preferences), + BUILDER_CALLBACK(update_preferences), NULL); */ diff --git a/src/gui/dialogs/snapshots.c b/src/gui/dialogs/snapshots.c index 31f3783..8abbdf2 100644 --- a/src/gui/dialogs/snapshots.c +++ b/src/gui/dialogs/snapshots.c @@ -32,6 +32,9 @@ #include +#include "../../gtkext/easygtk.h" + + /* Colonnes de l'arborescence d'instantanés */ typedef enum _SnapshotTreeColumn @@ -137,15 +140,15 @@ GtkWidget *create_snapshots_dialog(GLoadedBinary *binary, GtkWindow *parent, Gtk /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "on_dialog_destroy", G_CALLBACK(on_dialog_destroy), - "on_server_selection_changed", G_CALLBACK(on_server_selection_changed), - "on_tree_selection_changed", G_CALLBACK(on_tree_selection_changed), - "restore_old_snapshot", G_CALLBACK(restore_old_snapshot), - "create_new_snapshot", G_CALLBACK(create_new_snapshot), - "remove_old_snapshot", G_CALLBACK(remove_old_snapshot), - "delete_old_snapshot", G_CALLBACK(delete_old_snapshot), - "apply_new_snapshot_info", G_CALLBACK(apply_new_snapshot_info), - "close_dialog_box", G_CALLBACK(close_dialog_box), + BUILDER_CALLBACK(on_dialog_destroy), + BUILDER_CALLBACK(on_server_selection_changed), + BUILDER_CALLBACK(on_tree_selection_changed), + BUILDER_CALLBACK(restore_old_snapshot), + BUILDER_CALLBACK(create_new_snapshot), + BUILDER_CALLBACK(remove_old_snapshot), + BUILDER_CALLBACK(delete_old_snapshot), + BUILDER_CALLBACK(apply_new_snapshot_info), + BUILDER_CALLBACK(close_dialog_box), NULL); gtk_builder_connect_signals(builder, builder); diff --git a/src/gui/dialogs/storage.c b/src/gui/dialogs/storage.c index 88e667c..4822231 100644 --- a/src/gui/dialogs/storage.c +++ b/src/gui/dialogs/storage.c @@ -29,6 +29,9 @@ #include +#include "../../gtkext/easygtk.h" + + /* Colonnes de la liste des collections */ typedef enum _CollecFeatureColumn @@ -136,9 +139,9 @@ GtkWidget *create_storage_dialog(GLoadedBinary *binary, GtkWindow *parent, GtkBu /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "on_server_use_toggled", G_CALLBACK(on_server_use_toggled), - "on_local_feature_toggled", G_CALLBACK(on_local_feature_toggled), - "on_remote_feature_toggled", G_CALLBACK(on_remote_feature_toggled), + BUILDER_CALLBACK(on_server_use_toggled), + BUILDER_CALLBACK(on_local_feature_toggled), + BUILDER_CALLBACK(on_remote_feature_toggled), NULL); gtk_builder_connect_signals(builder, builder); diff --git a/src/gui/panels/bintree.c b/src/gui/panels/bintree.c index c05c4d4..eb2debc 100644 --- a/src/gui/panels/bintree.c +++ b/src/gui/panels/bintree.c @@ -38,6 +38,7 @@ #include "../panel-int.h" #include "../core/global.h" #include "../../core/queue.h" +#include "../../gtkext/easygtk.h" #include "../../gtkext/gtkdisplaypanel.h" #include "../../gtkext/named.h" #include "../../gtkext/tmgt.h" @@ -333,11 +334,11 @@ static void g_bintree_panel_init(GBintreePanel *panel) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "gtk_tree_view_collapse_all", G_CALLBACK(gtk_tree_view_collapse_all), - "gtk_tree_view_expand_all", G_CALLBACK(gtk_tree_view_expand_all), - "on_depth_spin_value_changed", G_CALLBACK(on_depth_spin_value_changed), - "on_search_entry_changed", G_CALLBACK(on_search_entry_changed), - "on_bintree_selection_changed", G_CALLBACK(on_bintree_selection_changed), + BUILDER_CALLBACK(gtk_tree_view_collapse_all), + BUILDER_CALLBACK(gtk_tree_view_expand_all), + BUILDER_CALLBACK(on_depth_spin_value_changed), + BUILDER_CALLBACK(on_search_entry_changed), + BUILDER_CALLBACK(on_bintree_selection_changed), NULL); gtk_builder_connect_signals(builder, panel); diff --git a/src/gui/panels/errors.c b/src/gui/panels/errors.c index 17eabef..905d87c 100644 --- a/src/gui/panels/errors.c +++ b/src/gui/panels/errors.c @@ -41,6 +41,7 @@ #include "../../core/queue.h" #include "../../format/format.h" #include "../../glibext/signal.h" +#include "../../gtkext/easygtk.h" #include "../../gtkext/gtkdisplaypanel.h" #include "../../gtkext/named.h" @@ -337,10 +338,10 @@ static void g_error_panel_init(GErrorPanel *panel) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "gtk_tree_view_collapse_all", G_CALLBACK(gtk_tree_view_collapse_all), - "gtk_tree_view_expand_all", G_CALLBACK(gtk_tree_view_expand_all), - "on_error_filter_toggled", G_CALLBACK(on_error_filter_toggled), - "on_error_selection_changed", G_CALLBACK(on_error_selection_changed), + BUILDER_CALLBACK(gtk_tree_view_collapse_all), + BUILDER_CALLBACK(gtk_tree_view_expand_all), + BUILDER_CALLBACK(on_error_filter_toggled), + BUILDER_CALLBACK(on_error_selection_changed), NULL); gtk_builder_connect_signals(builder, panel); diff --git a/src/gui/panels/glance.c b/src/gui/panels/glance.c index c7478b5..22d4890 100644 --- a/src/gui/panels/glance.c +++ b/src/gui/panels/glance.c @@ -30,6 +30,7 @@ #include "../panel-int.h" +#include "../../gtkext/easygtk.h" #include "../../gtkext/named.h" @@ -202,11 +203,11 @@ static void g_glance_panel_init(GGlancePanel *panel) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "redraw_glance_area", G_CALLBACK(redraw_glance_area), - "on_glance_resize", G_CALLBACK(on_glance_resize), - "on_button_press_over_glance", G_CALLBACK(on_button_press_over_glance), - "on_button_release_over_glance", G_CALLBACK(on_button_release_over_glance), - "on_mouse_motion_over_glance", G_CALLBACK(on_mouse_motion_over_glance), + BUILDER_CALLBACK(redraw_glance_area), + BUILDER_CALLBACK(on_glance_resize), + BUILDER_CALLBACK(on_button_press_over_glance), + BUILDER_CALLBACK(on_button_release_over_glance), + BUILDER_CALLBACK(on_mouse_motion_over_glance), NULL); gtk_builder_connect_signals(builder, panel); diff --git a/src/gui/panels/history.c b/src/gui/panels/history.c index 4cf54aa..320babb 100644 --- a/src/gui/panels/history.c +++ b/src/gui/panels/history.c @@ -36,6 +36,7 @@ #include "../../analysis/binary.h" #include "../../glibext/chrysamarshal.h" #include "../../glibext/signal.h" +#include "../../gtkext/easygtk.h" #include "../../gtkext/named.h" @@ -186,10 +187,10 @@ static void g_history_panel_init(GHistoryPanel *panel) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "on_history_selection_change", G_CALLBACK(on_history_selection_change), - "do_history_undo", G_CALLBACK(do_history_undo), - "do_history_redo", G_CALLBACK(do_history_redo), - "do_history_clean", G_CALLBACK(do_history_clean), + BUILDER_CALLBACK(on_history_selection_change), + BUILDER_CALLBACK(do_history_undo), + BUILDER_CALLBACK(do_history_redo), + BUILDER_CALLBACK(do_history_clean), NULL); gtk_builder_connect_signals(builder, panel); diff --git a/src/gui/panels/regedit.c b/src/gui/panels/regedit.c index ea324cb..906d274 100644 --- a/src/gui/panels/regedit.c +++ b/src/gui/panels/regedit.c @@ -262,11 +262,11 @@ static void g_regedit_panel_init(GRegeditPanel *panel) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "on_param_search_changed", G_CALLBACK(on_param_search_changed), - "track_focus_change_in_text_area", G_CALLBACK(track_focus_change_in_text_area), - "on_button_press_over_params", G_CALLBACK(on_button_press_over_params), - "on_key_pressed_over_params", G_CALLBACK(on_key_pressed_over_params), - "on_param_value_edited", G_CALLBACK(on_param_value_edited), + BUILDER_CALLBACK(on_param_search_changed), + BUILDER_CALLBACK(track_focus_change_in_text_area), + BUILDER_CALLBACK(on_button_press_over_params), + BUILDER_CALLBACK(on_key_pressed_over_params), + BUILDER_CALLBACK(on_param_value_edited), NULL); gtk_builder_connect_signals(builder, panel); diff --git a/src/gui/panels/strings.c b/src/gui/panels/strings.c index aee5231..1ad7e8e 100644 --- a/src/gui/panels/strings.c +++ b/src/gui/panels/strings.c @@ -385,9 +385,9 @@ static void g_strings_panel_init(GStringsPanel *panel) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "on_button_event_over_strings", G_CALLBACK(on_button_event_over_strings), - "on_key_pressed_over_strings", G_CALLBACK(on_key_pressed_over_strings), - "on_strings_selection_change", G_CALLBACK(on_strings_selection_change), + BUILDER_CALLBACK(on_button_event_over_strings), + BUILDER_CALLBACK(on_key_pressed_over_strings), + BUILDER_CALLBACK(on_strings_selection_change), NULL); gtk_builder_connect_signals(builder, panel); diff --git a/src/gui/panels/symbols.c b/src/gui/panels/symbols.c index ec85479..ec554ff 100644 --- a/src/gui/panels/symbols.c +++ b/src/gui/panels/symbols.c @@ -382,12 +382,12 @@ static void g_symbols_panel_init(GSymbolsPanel *panel) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "on_symbols_list_display_toggle", G_CALLBACK(on_symbols_list_display_toggle), - "on_symbols_tree_display_toggle", G_CALLBACK(on_symbols_tree_display_toggle), - "reorganize_symbols_tree_view", G_CALLBACK(reorganize_symbols_tree_view), - "on_symbols_filter_changed", G_CALLBACK(on_symbols_filter_changed), - "on_symbols_selection_change", G_CALLBACK(on_symbols_selection_change), - "track_focus_change_in_text_area", G_CALLBACK(track_focus_change_in_text_area), + BUILDER_CALLBACK(on_symbols_list_display_toggle), + BUILDER_CALLBACK(on_symbols_tree_display_toggle), + BUILDER_CALLBACK(reorganize_symbols_tree_view), + BUILDER_CALLBACK(on_symbols_filter_changed), + BUILDER_CALLBACK(on_symbols_selection_change), + BUILDER_CALLBACK(track_focus_change_in_text_area), NULL); gtk_builder_connect_signals(builder, panel); diff --git a/src/gui/panels/welcome.c b/src/gui/panels/welcome.c index 02649e1..24674a7 100644 --- a/src/gui/panels/welcome.c +++ b/src/gui/panels/welcome.c @@ -45,6 +45,7 @@ #include "../../core/global.h" #include "../../core/params.h" #include "../../core/paths.h" +#include "../../gtkext/easygtk.h" #include "../../gtkext/named.h" @@ -246,12 +247,12 @@ static void g_welcome_panel_init(GWelcomePanel *panel) /* Connexion des signaux */ gtk_builder_add_callback_symbols(builder, - "on_tip_background_draw", G_CALLBACK(on_tip_background_draw), - "on_new_binary_clicked", G_CALLBACK(on_new_binary_clicked), - "on_row_activated_for_projects", G_CALLBACK(on_row_activated_for_projects), - "on_startup_toggled", G_CALLBACK(on_startup_toggled), - "on_tip_previous_clicked", G_CALLBACK(on_tip_previous_clicked), - "on_tip_next_clicked", G_CALLBACK(on_tip_next_clicked), + BUILDER_CALLBACK(on_tip_background_draw), + BUILDER_CALLBACK(on_new_binary_clicked), + BUILDER_CALLBACK(on_row_activated_for_projects), + BUILDER_CALLBACK(on_startup_toggled), + BUILDER_CALLBACK(on_tip_previous_clicked), + BUILDER_CALLBACK(on_tip_next_clicked), NULL); gtk_builder_connect_signals(builder, panel); -- cgit v0.11.2-87-g4458