Moved the openida_binary structure to a GOpenidaBinary GLib object.

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

1 files changed, 13 insertions, 13 deletions

diff --git a/src/editor.c b/src/editor.c
index 49c255b..76c8181 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -755,7 +755,7 @@ void mcb_view_change_support(GtkRadioMenuItem *menuitem, GObject *ref)
     GSList *group;                          /* Liste de menus radio        */
     GSList *iter;                           /* Boucle de parcours          */
     BinaryView view;                        /* Nouvelle vue à présenter    */
-    openida_binary *binary;                 /* Edition courante            */
+    GOpenidaBinary *binary;                 /* Edition courante            */
     GtkBinView *binview;                    /* Afficheur effectif de code  */
     GtkWidget *panel;                       /* Nouveau support à utiliser  */
     GtkDockPanel *dpanel;                   /* Support de panneaux         */
@@ -772,13 +772,13 @@ void mcb_view_change_support(GtkRadioMenuItem *menuitem, GObject *ref)
 
         view = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(iter->data), "kind_of_view"));
 
-        binary = (openida_binary *)g_object_get_data(ref, "current_binary");
+        binary = (GOpenidaBinary *)g_object_get_data(ref, "current_binary");
         panel = get_view_for_openida_project_binary(get_current_openida_project(), binary, view, &binview);
 
         g_object_set_data(ref, "binview", binview);
 
         dpanel = GTK_DOCK_PANEL(g_object_get_data(ref, "binpanel"));
-        ditem = gtk_dock_panel_item_from_name(dpanel, openida_binary_to_string(binary));
+        ditem = gtk_dock_panel_item_from_name(dpanel, g_openida_binary_to_string(binary));
 
         gtk_dock_panel_replace_item_content(dpanel, ditem, panel);
 
@@ -859,7 +859,7 @@ void mcb_project_add_binary(GtkMenuItem *menuitem, gpointer data)
 {
     GtkWidget *dialog;                      /* Boîte à afficher            */
     gchar *filename;                        /* Nom du fichier à intégrer   */
-    openida_binary *binary;                 /* Représentation chargée      */
+    GOpenidaBinary *binary;                 /* Représentation chargée      */
 
     dialog = gtk_file_chooser_dialog_new (_("Open a binary file"), GTK_WINDOW(data),
                                           GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -871,7 +871,7 @@ void mcb_project_add_binary(GtkMenuItem *menuitem, gpointer data)
     {
         filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
 
-        binary = load_binary_file(filename);
+        binary = g_openida_binary_new_from_file(filename);
 
         if (binary != NULL)
         {
@@ -903,12 +903,12 @@ void mcb_project_add_binary(GtkMenuItem *menuitem, gpointer data)
 
 void mcb_project_remove_binary(GtkMenuItem *menuitem, gpointer data)
 {
-    openida_binary *binary;                 /* Représentation chargée      */
+    GOpenidaBinary *binary;                 /* Représentation chargée      */
 
     binary = g_object_get_data(G_OBJECT(menuitem), "binary");
 
     detach_binary_to_openida_project(get_current_openida_project(), binary);
-    unload_binary_file(binary);
+    //unload_binary_file(binary);
 
     reload_menu_project(G_OBJECT(data));
 
@@ -965,7 +965,7 @@ void reload_menu_project(GObject *ref)
     GList *list;                            /* Liste des éléments en place */
     GList *iter;                            /* Boucle de parcours #1       */
     size_t count;                           /* Nombre de binaires attachés */
-    const openida_binary **binaries;        /* Liste de ces binaires       */
+    const GOpenidaBinary **binaries;        /* Liste de ces binaires       */
     size_t i;                               /* Boucle de parcours #2       */
     const char *desc;                       /* Description à afficher      */
     GtkWidget *submenuitem;                 /* Sous-menu à ajouter         */
@@ -988,7 +988,7 @@ void reload_menu_project(GObject *ref)
 
     for (i = 0; i < count; i++)
     {
-        desc = openida_binary_to_string(binaries[i]);
+        desc = g_openida_binary_to_string(binaries[i]);
 
         submenuitem = qck_create_menu_item(NULL, NULL, desc, G_CALLBACK(mcb_project_remove_binary), ref);
         g_object_set_data(G_OBJECT(submenuitem), "binary", binaries[i]);
@@ -1007,7 +1007,7 @@ void debugger_stopped_cb(GBinaryDebugger *debugger, uint64_t last, uint64_t cur,
 
     GObject *ref;
 
-    openida_binary *binary;
+    GOpenidaBinary *binary;
     GRenderingLine *line;
 
 
@@ -1025,7 +1025,7 @@ void debugger_stopped_cb(GBinaryDebugger *debugger, uint64_t last, uint64_t cur,
 
     if (last != cur)
     {
-        line = g_rendering_line_find_by_address(get_openida_binary_lines(binary), NULL/* FIXME */, last);
+        line = g_rendering_line_find_by_address(g_openida_binary_get_lines(binary), NULL/* FIXME */, last);
 
         if (line != NULL)
             g_rendering_line_remove_flag(line, RLF_RUNNING_BP);
@@ -1035,7 +1035,7 @@ void debugger_stopped_cb(GBinaryDebugger *debugger, uint64_t last, uint64_t cur,
 
     printf("bp at 0x%016llx\n", cur);
 
-    line = g_rendering_line_find_by_address(get_openida_binary_lines(binary), NULL/* FIXME */, cur);
+    line = g_rendering_line_find_by_address(g_openida_binary_get_lines(binary), NULL/* FIXME */, cur);
 
     if (line != NULL)
         g_rendering_line_add_flag(line, RLF_RUNNING_BP);
@@ -1081,7 +1081,7 @@ void debugger_stopped_cb(GBinaryDebugger *debugger, uint64_t last, uint64_t cur,
 
 void mcb_debug_start(GtkCheckMenuItem *menuitem, gpointer data)
 {
-    openida_binary *binary;                 /* Binaire à analyser          */
+    GOpenidaBinary *binary;                 /* Binaire à analyser          */
     GBinaryDebugger *debugger;              /* Débogueur offrant l'analyse */