diff options
Diffstat (limited to 'src/project.c')
| -rw-r--r-- | src/project.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/project.c b/src/project.c index 1a72bd6..40ddb14 100644 --- a/src/project.c +++ b/src/project.c @@ -42,7 +42,7 @@ /* Conservation d'un binaire chargé */ typedef struct _loaded_binary { - openida_binary *binary; /* Binaire en question */ + GOpenidaBinary *binary; /* Binaire en question */ GtkWidget *views[BVW_COUNT]; /* Composants pour l'affichage */ @@ -50,7 +50,7 @@ typedef struct _loaded_binary /* Met en place un nouveau binaire pour un projet. */ -loaded_binary *load_openida_binary(openida_binary *); +loaded_binary *load_openida_binary(GOpenidaBinary *); /* Fournit un support d'affichage donné pour un binaire chargé. */ GtkWidget *get_loaded_binary_view(const loaded_binary *, BinaryView); @@ -89,7 +89,7 @@ struct openida_project * * ******************************************************************************/ -loaded_binary *load_openida_binary(openida_binary *binary) +loaded_binary *load_openida_binary(GOpenidaBinary *binary) { loaded_binary *result; /* Structure à renvoyer */ BinaryView i; /* Boucle de parcours */ @@ -115,7 +115,8 @@ loaded_binary *load_openida_binary(openida_binary *binary) break; } - gtk_bin_view_set_rendering_lines(GTK_BIN_VIEW(view), binary, get_openida_binary_lines(binary), NULL); + gtk_bin_view_set_rendering_lines(GTK_BIN_VIEW(view), binary, + g_openida_binary_get_lines(binary), NULL); gtk_widget_show(view); @@ -235,7 +236,7 @@ openida_project *g_openida_project_new_from_xml(const char *filename) unsigned int i; /* Boucle de parcours */ size_t access_len; /* Taille d'un chemin interne */ char *access; /* Chemin pour une sous-config.*/ - openida_binary *binary; /* Représentation à intégrer */ + GOpenidaBinary *binary; /* Représentation à intégrer */ if (!open_xml_file(filename, &xdoc, &context)) return NULL; @@ -253,7 +254,7 @@ openida_project *g_openida_project_new_from_xml(const char *filename) access = calloc(access_len, sizeof(char)); snprintf(access, access_len, "/OpenIDAProject/Binaries/Binary[position()=%u]", i + 1); - binary = g_binary_file_new_from_xml(context, access); + binary = g_openida_binary_new_from_xml(context, access); free(access); @@ -392,7 +393,7 @@ bool has_storing_filename(const openida_project *project) * * ******************************************************************************/ -void attach_binary_to_openida_project(openida_project *project, openida_binary *binary) +void attach_binary_to_openida_project(openida_project *project, GOpenidaBinary *binary) { project->binaries = (loaded_binary **)realloc(project->binaries, ++project->binaries_count * sizeof(loaded_binary *)); @@ -415,7 +416,7 @@ void attach_binary_to_openida_project(openida_project *project, openida_binary * * * ******************************************************************************/ -void detach_binary_to_openida_project(openida_project *project, openida_binary *binary) +void detach_binary_to_openida_project(openida_project *project, GOpenidaBinary *binary) { #if 0 size_t i; /* Boucle de parcours */ @@ -424,10 +425,10 @@ void detach_binary_to_openida_project(openida_project *project, openida_binary * if (project->binaries[i] == binary) break; if ((i + 1) < project->binaries_count) - memmove(&project->binaries[i], &project->binaries[i + 1], (project->binaries_count - i - 1) * sizeof(openida_binary *)); + memmove(&project->binaries[i], &project->binaries[i + 1], (project->binaries_count - i - 1) * sizeof(GOpenidaBinary *)); - project->binaries = (openida_binary **)realloc(project->binaries, - --project->binaries_count * sizeof(openida_binary *)); + project->binaries = (GOpenidaBinary **)realloc(project->binaries, + --project->binaries_count * sizeof(GOpenidaBinary *)); #endif } @@ -447,7 +448,7 @@ void detach_binary_to_openida_project(openida_project *project, openida_binary * * * ******************************************************************************/ -GtkWidget *get_view_for_openida_project_binary(const openida_project *project, const openida_binary *binary, BinaryView view, GtkBinView **binview) +GtkWidget *get_view_for_openida_project_binary(const openida_project *project, const GOpenidaBinary *binary, BinaryView view, GtkBinView **binview) { GtkWidget *result; /* Composant GTK à retourner */ size_t i; /* Boucle de parcours */ @@ -480,7 +481,7 @@ GtkWidget *get_view_for_openida_project_binary(const openida_project *project, c * * ******************************************************************************/ -const openida_binary **get_openida_project_binaries(const openida_project *project, size_t *count) +const GOpenidaBinary **get_openida_project_binaries(const openida_project *project, size_t *count) { *count = project->binaries_count; @@ -620,7 +621,7 @@ void display_openida_project(const openida_project *project, GObject *ref) { GtkDockPanel *dpanel; /* Support de panneaux */ size_t i; /* Boucle de parcours */ - openida_binary *binary; + GOpenidaBinary *binary; GtkWidget *view; /* Affichage du code binaire */ GtkDockItem *ditem; /* Panneau avec ses infos. */ GtkBinView *binview; /* Affichage à faire défiler */ @@ -633,7 +634,7 @@ void display_openida_project(const openida_project *project, GObject *ref) view = get_loaded_binary_view(project->binaries[i], BVW_BLOCK); - ditem = gtk_dock_item_new(openida_binary_to_string(binary), view); + ditem = gtk_dock_item_new(g_openida_binary_to_string(binary), view); gtk_dock_panel_add_item(dpanel, ditem); } @@ -648,7 +649,7 @@ void display_openida_project(const openida_project *project, GObject *ref) g_object_set_data(ref, "binview", binview); - reload_symbols_panel_content(get_panel(PNT_SYMBOLS), get_openida_binary_format(binary)); + reload_symbols_panel_content(get_panel(PNT_SYMBOLS), g_openida_binary_get_format(binary)); } |