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, 12 insertions, 11 deletions

diff --git a/src/gui/menus/binary.c b/src/gui/menus/binary.c
index ac59444..8699c02 100644
--- a/src/gui/menus/binary.c
+++ b/src/gui/menus/binary.c
@@ -89,7 +89,7 @@ GtkWidget *build_menu_binary(GObject *ref, GtkAccelGroup *accgroup, GMenuBar *ba
 
 static void mcb_binary_export(GtkMenuItem *menuitem, GMenuBar *bar)
 {
-    GOpenidaBinary *binary;                 /* Edition courante            */
+    GLoadedBinary *binary;                  /* Edition courante            */
 
     binary = g_editor_item_get_current_binary(G_EDITOR_ITEM(bar));
 
diff --git a/src/gui/menus/debug.c b/src/gui/menus/debug.c
index 963c095..666a605 100644
--- a/src/gui/menus/debug.c
+++ b/src/gui/menus/debug.c
@@ -93,10 +93,10 @@ GtkWidget *build_menu_debug(GObject *ref, GtkAccelGroup *accgroup)
 
 static void mcb_debug_start_stop(GtkMenuItem *menuitem, GObject *ref)
 {
-    GOpenidaBinary *binary;                 /* Edition courante            */
+    GLoadedBinary *binary;                  /* Edition courante            */
     GBinaryDebugger *debugger;              /* Module prêt à emploi        */
 
-    binary = (GOpenidaBinary *)g_object_get_data(ref, "current_binary");
+    binary = (GLoadedBinary *)g_object_get_data(ref, "current_binary");
     debugger = NULL;//get_main_debugger_for_binary(get_current_openida_project(), binary);
 
     if (debugger == NULL)
diff --git a/src/gui/menus/project.c b/src/gui/menus/project.c
index 96b411b..dbf61bc 100644
--- a/src/gui/menus/project.c
+++ b/src/gui/menus/project.c
@@ -32,6 +32,7 @@
 
 
 #include "../editem-int.h"
+#include "../../analysis/binaries/file.h"
 #include "../../gtkext/easygtk.h"
 
 
@@ -115,7 +116,7 @@ void update_menu_project_for_project(GtkWidget *widget, GStudyProject *project,
     GList *list;                            /* Liste des éléments en place */
     GList *iter;                            /* Boucle de parcours #1       */
     size_t count;                           /* Nombre de binaires attachés */
-    GOpenidaBinary **binaries;              /* Liste de ces binaires       */
+    GLoadedBinary **binaries;               /* Liste de ces binaires       */
     size_t i;                               /* Boucle de parcours #2       */
     const char *desc;                       /* Description à afficher      */
     GtkWidget *submenuitem;                 /* Sous-menu à ajouter         */
@@ -138,7 +139,7 @@ void update_menu_project_for_project(GtkWidget *widget, GStudyProject *project,
 
     for (i = 0; i < count; i++)
     {
-        desc = g_openida_binary_to_string(binaries[i]);
+        desc = g_loaded_binary_get_filename(binaries[i], true);
 
         submenuitem = qck_create_menu_item(NULL, NULL, desc,
                                            G_CALLBACK(mcb_project_remove_binary), project);
@@ -175,7 +176,7 @@ static void mcb_project_add_binary_file(GtkMenuItem *menuitem, GMenuBar *bar)
     GtkWidget *dialog;                      /* Boîte à afficher            */
     char *dir;                              /* Répertoire courant          */
     gchar *filename;                        /* Nom du fichier à intégrer   */
-    GOpenidaBinary *binary;                 /* Représentation chargée      */
+    GLoadedBinary *binary;                  /* Représentation chargée      */
 
     dialog = gtk_file_chooser_dialog_new(_("Open a binary file"),
                                          GTK_WINDOW(G_EDITOR_ITEM(bar)->ref),
@@ -204,13 +205,13 @@ static void mcb_project_add_binary_file(GtkMenuItem *menuitem, GMenuBar *bar)
     {
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 
-        binary = g_openida_binary_new_from_file(filename);
+        binary = g_file_binary_new_from_file(filename);
 
         if (binary != NULL)
         {
             g_signal_connect(binary, "disassembly-done",
                              G_CALLBACK(g_study_project_add_loaded_binary), get_current_project());
-            g_openida_binary_analyse(binary);
+            g_loaded_binary_analyse(binary);
         }
 
         g_free(filename);
@@ -237,9 +238,9 @@ static void mcb_project_add_binary_file(GtkMenuItem *menuitem, GMenuBar *bar)
 
 static void mcb_project_remove_binary(GtkMenuItem *menuitem, GStudyProject *project)
 {
-    GOpenidaBinary *binary;                 /* Binaire à retirer           */
+    GLoadedBinary *binary;                  /* Binaire à retirer           */
 
-    binary = G_OPENIDA_BINARY(g_object_get_data(G_OBJECT(menuitem), "binary"));
+    binary = G_LOADED_BINARY(g_object_get_data(G_OBJECT(menuitem), "binary"));
 
     g_study_project_detach_binary(project, binary);
     g_object_unref(G_OBJECT(binary));
diff --git a/src/gui/menus/view.c b/src/gui/menus/view.c
index e0e7cc4..748df9f 100644
--- a/src/gui/menus/view.c
+++ b/src/gui/menus/view.c
@@ -178,7 +178,7 @@ static void mcb_view_change_support(GtkRadioMenuItem *menuitem, GMenuBar *bar)
     BinaryView view;                        /* Nouvelle vue à présenter    */
     GtkViewPanel *vpanel;                   /* Afficheur effectif de code  */
     GtkWidget *station;                     /* Base du remplacement        */
-    GOpenidaBinary *binary;                 /* Edition courante            */
+    GLoadedBinary *binary;                  /* Edition courante            */
     GtkWidget *scroll;                      /* Nouveau support à utiliser  */
 
     /* On ne traite qu'une seule fois ! */