Cleaned the code and handled file binaries properly.

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

1 files changed, 15 insertions, 15 deletions

diff --git a/src/editor.c b/src/editor.c
index 54149ff..3c861d1 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -119,7 +119,7 @@ void update_debug_menu_items(GObject *, gboolean);
 static void on_dock_item_switch(GtkDockPanel *, GtkWidget *, GObject *);
 
 /* Met en concordance les menus avec l'édition courante. */
-static void refresh_editor_menus(GObject *, GOpenidaBinary *, GtkBinView *);
+static void refresh_editor_menus(GObject *, GLoadedBinary *, GtkBinView *);
 
 
 
@@ -681,10 +681,10 @@ void mcb_open_recent_project(GtkMenuItem *menuitem, GObject *ref)
 
 static void mcb_binary_select_parts(GtkMenuItem *menuitem, GObject *ref)
 {
-    GOpenidaBinary *binary;                 /* Binaire courant à l'écran   */
+    GLoadedBinary *binary;                  /* Binaire courant à l'écran   */
     GtkWidget *dialog;                      /* Boîte de dialogue à montrer */
 
-    binary = G_OPENIDA_BINARY(g_object_get_data(ref, "current_binary"));
+    binary = G_LOADED_BINARY(g_object_get_data(ref, "current_binary"));
 
     dialog = create_sections_dialog(binary, GTK_WINDOW(ref));
     gtk_widget_show(dialog);
@@ -707,10 +707,10 @@ static void mcb_binary_select_parts(GtkMenuItem *menuitem, GObject *ref)
 
 static void mcb_binary_select_plugins(GtkMenuItem *menuitem, GObject *ref)
 {
-    GOpenidaBinary *binary;                 /* Binaire courant à l'écran   */
+    GLoadedBinary *binary;                  /* Binaire courant à l'écran   */
     GtkWidget *dialog;                      /* Boîte de dialogue à montrer */
 
-    binary = G_OPENIDA_BINARY(g_object_get_data(ref, "current_binary"));
+    binary = G_LOADED_BINARY(g_object_get_data(ref, "current_binary"));
 
     dialog = create_plugins_selection_dialog(binary, GTK_WINDOW(ref));
     gtk_widget_show(dialog);
@@ -723,10 +723,10 @@ static void mcb_binary_select_plugins(GtkMenuItem *menuitem, GObject *ref)
 
 void debugger_stopped_cb(GBinaryDebugger *debugger, uint64_t last, uint64_t cur, gpointer data)
 {
-
+#if 0
     GObject *ref;
 
-    GOpenidaBinary *binary;
+    GLoadedBinary *binary;
     GRenderingLine *line;
 
 
@@ -744,7 +744,7 @@ void debugger_stopped_cb(GBinaryDebugger *debugger, uint64_t last, uint64_t cur,
 
     if (last != cur)
     {
-        line = g_rendering_line_find_by_address(g_openida_binary_get_lines(binary), NULL/* FIXME */, last);
+        line = g_rendering_line_find_by_address(g_loaded_binary_get_lines(binary), NULL/* FIXME */, last);
 
         if (line != NULL)
             g_rendering_line_remove_flag(line, RLF_RUNNING_BP);
@@ -754,7 +754,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(g_openida_binary_get_lines(binary), NULL/* FIXME */, cur);
+    line = g_rendering_line_find_by_address(g_loaded_binary_get_lines(binary), NULL/* FIXME */, cur);
 
     if (line != NULL)
         g_rendering_line_add_flag(line, RLF_RUNNING_BP);
@@ -780,7 +780,7 @@ void debugger_stopped_cb(GBinaryDebugger *debugger, uint64_t last, uint64_t cur,
 
     refresh_registers_panel_with_registers(get_panel(PNT_REGISTERS), values, count);
 
-
+#endif
 
 }
 
@@ -800,7 +800,7 @@ void debugger_stopped_cb(GBinaryDebugger *debugger, uint64_t last, uint64_t cur,
 
 void mcb_debug_start(GtkCheckMenuItem *menuitem, gpointer data)
 {
-    GOpenidaBinary *binary;                 /* Binaire à analyser          */
+    GLoadedBinary *binary;                  /* Binaire à analyser          */
     GBinaryDebugger *debugger;              /* Débogueur offrant l'analyse */
 
 
@@ -968,8 +968,8 @@ void update_debug_menu_items(GObject *ref, gboolean stopped)
 
 static void on_dock_item_switch(GtkDockPanel *panel, GtkWidget *widget, GObject *ref)
 {
-    GOpenidaBinary *old_binary;             /* Ancien binaire édité        */
-    GOpenidaBinary *binary;                 /* Binaire en cours d'édition  */
+    GLoadedBinary *old_binary;              /* Ancien binaire édité        */
+    GLoadedBinary *binary;                  /* Binaire en cours d'édition  */
 
     if (GTK_IS_SCROLLED_WINDOW(widget))
         widget = gtk_bin_get_child(GTK_BIN(widget));
@@ -981,7 +981,7 @@ static void on_dock_item_switch(GtkDockPanel *panel, GtkWidget *widget, GObject
     {
         /* Changement de binaire ? */
 
-        old_binary = G_OPENIDA_BINARY(g_object_get_data(ref, "current_binary"));
+        old_binary = G_LOADED_BINARY(g_object_get_data(ref, "current_binary"));
         binary = gtk_view_panel_get_binary(GTK_VIEW_PANEL(widget));
 
         if (old_binary != binary)
@@ -1015,7 +1015,7 @@ static void on_dock_item_switch(GtkDockPanel *panel, GtkWidget *widget, GObject
 *                                                                             *
 ******************************************************************************/
 
-static void refresh_editor_menus(GObject *ref, GOpenidaBinary *binary, GtkBinView *view)
+static void refresh_editor_menus(GObject *ref, GLoadedBinary *binary, GtkBinView *view)
 {
 #if 0
     GtkCheckMenuItem *menuitem;             /* Menu à coche à traiter      */