Cleaned the code and handled file binaries properly.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@259 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

4 files changed, 13 insertions, 12 deletions

diff --git a/src/panels/breaks.c b/src/panels/breaks.c
index 31e2217..958d6fb 100644
--- a/src/panels/breaks.c
+++ b/src/panels/breaks.c
@@ -26,6 +26,7 @@
 
 
 #include "panel-int.h"
+#include "../debug/break.h"
 #include "../gtkext/easygtk.h"
 #include "../gtkext/support.h"
 
@@ -42,7 +43,7 @@ struct _GBreaksPanel
     GtkTreeView *treeview;                  /* Composant d'affichage       */
     GtkTreeStore *store;                    /* Modèle de gestion           */
 
-    GOpenidaBinary *binary;                 /* Binaire en cours d'étude    */
+    GLoadedBinary *binary;                  /* Binaire en cours d'étude    */
 
 };
 
@@ -75,13 +76,13 @@ static void g_breaks_panel_class_init(GBreaksPanelClass *);
 static void g_breaks_panel_init(GBreaksPanel *);
 
 /* Réagit à un changement du binaire courant. */
-static void reload_breaks_for_new_binary(GBreaksPanel *, GOpenidaBinary *);
+static void reload_breaks_for_new_binary(GBreaksPanel *, GLoadedBinary *);
 
 
 
 
 /* Intègre à l'affichage un groupe de points d'arrêt. */
-static void add_bp_group_to_breaks_panel(GOpenidaBinary *, GBreakGroup *, GBreaksPanel *);
+static void add_bp_group_to_breaks_panel(GLoadedBinary *, GBreakGroup *, GBreaksPanel *);
 
 /* Réagit à une nouvelle création de point d'arrêt. */
 static void refresh_breaks_panel_on_bp_added(GBreakGroup *, GBreakPoint *, GBreaksPanel *);
@@ -250,14 +251,14 @@ GEditorPanel *g_breaks_panel_new(void)
 *                                                                             *
 ******************************************************************************/
 
-static void reload_breaks_for_new_binary(GBreaksPanel *panel, GOpenidaBinary *binary)
+static void reload_breaks_for_new_binary(GBreaksPanel *panel, GLoadedBinary *binary)
 {
 
     printf("CHNAGE BINARY !\n");
 
     panel->binary = binary;
 
-    g_openida_binary_for_each_bp_group(binary, (GExtFunc)add_bp_group_to_breaks_panel, panel);
+    //g_loaded_binary_for_each_bp_group(binary, (GExtFunc)add_bp_group_to_breaks_panel, panel);
 
 
 }
@@ -289,7 +290,7 @@ static void reload_breaks_for_new_binary(GBreaksPanel *panel, GOpenidaBinary *bi
 *                                                                             *
 ******************************************************************************/
 
-static void add_bp_group_to_breaks_panel(GOpenidaBinary *binary, GBreakGroup *group, GBreaksPanel *panel)
+static void add_bp_group_to_breaks_panel(GLoadedBinary *binary, GBreakGroup *group, GBreaksPanel *panel)
 {
     /* FIXME : bloquer toute émission de signal tant que les ajouts ne sont pas terminés. */
 
@@ -325,7 +326,7 @@ static void refresh_breaks_panel_on_bp_added(GBreakGroup *group, GBreakPoint *po
     char address[VMPA_MAX_SIZE];            /* Conversion de l'adresse     */
     GtkTreeIter iter;                       /* Point d'insertion           */
 
-    format = g_openida_binary_get_format(panel->binary);
+    format = g_loaded_binary_get_format(panel->binary);
     proc = get_arch_processor_from_format(format);
 
     vmpa_to_string(g_break_point_get_address(point),
diff --git a/src/panels/panel-int.h b/src/panels/panel-int.h
index 543c33c..7579eae 100644
--- a/src/panels/panel-int.h
+++ b/src/panels/panel-int.h
@@ -35,7 +35,7 @@
 
 
 /* Réagit à un changement du binaire courant. */
-typedef void (* reload_for_new_binary_fc) (GEditorPanel *, GOpenidaBinary *);
+typedef void (* reload_for_new_binary_fc) (GEditorPanel *, GLoadedBinary *);
 
 /* Réagit à un changement d'affichage principal de contenu. */
 typedef void (* reload_for_new_view_fc) (GEditorPanel *, GtkViewPanel *, bool);
diff --git a/src/panels/panel.c b/src/panels/panel.c
index 5922fe5..4d08b7f 100644
--- a/src/panels/panel.c
+++ b/src/panels/panel.c
@@ -106,7 +106,7 @@ static void g_editor_panel_init(GEditorPanel *panel)
 *                                                                             *
 ******************************************************************************/
 
-void change_current_binary_in_panels(GObject *ref, GOpenidaBinary *binary)
+void change_current_binary_in_panels(GObject *ref, GLoadedBinary *binary)
 {
 
 
@@ -193,7 +193,7 @@ void place_all_panels_in_editor(GtkWidget *top)
 *                                                                             *
 ******************************************************************************/
 
-void notify_panels_of_binary_change(GOpenidaBinary *binary)
+void notify_panels_of_binary_change(GLoadedBinary *binary)
 {
     GEditorPanel *iter;                     /* Boucle de parcours          */
 
diff --git a/src/panels/panel.h b/src/panels/panel.h
index b946222..60ce657 100644
--- a/src/panels/panel.h
+++ b/src/panels/panel.h
@@ -64,7 +64,7 @@ GType g_editor_panel_get_type(void);
 
 
 /* Répercute sur les panneaux un nouveau binaire actif. */
-void change_current_binary_in_panels(GObject *, GOpenidaBinary *);
+void change_current_binary_in_panels(GObject *, GLoadedBinary *);
 
 
 
@@ -77,7 +77,7 @@ void init_internal_panels(void);
 void place_all_panels_in_editor(GtkWidget *);
 
 /* Lance une actualisation du fait d'un changement de binaire. */
-void notify_panels_of_binary_change(GOpenidaBinary *);
+void notify_panels_of_binary_change(GLoadedBinary *);
 
 /* Lance une actualisation du fait d'un changement de vue. */
 void notify_panels_of_view_change(GtkViewPanel *, bool);