Used the new macro used to provide callbacks to GtkBuilder everywhere.

8 files changed, 43 insertions, 38 deletions

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);