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

8 files changed, 38 insertions, 27 deletions

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 <i18n.h>
 
 
+#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 <stdlib.h>
 
 
+#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);