Removed most of the functions using the editor items as global access to active items.

1 files changed, 13 insertions, 8 deletions

diff --git a/src/gui/panels/strings.c b/src/gui/panels/strings.c
index 8e7c702..c9d971e 100644
--- a/src/gui/panels/strings.c
+++ b/src/gui/panels/strings.c
@@ -30,6 +30,7 @@
 
 
 #include "panel-int.h"
+#include "../core/global.h"
 #include "../dialogs/gotox.h"
 #include "../../common/extstr.h"
 #include "../../core/params.h"
@@ -105,7 +106,7 @@ static void g_strings_panel_finalize(GStringsPanel *);
 static void change_strings_panel_current_binary(GStringsPanel *, GLoadedBinary *);
 
 /* Réagit au changement de sélection des chaînes textuelles. */
-static void on_strings_selection_change(GtkTreeSelection *, GStringsPanel *);
+static void on_strings_selection_change(GtkTreeSelection *, gpointer);
 
 /* Etablit une comparaison entre deux chaînes de caractères. */
 static gint compare_strings_list_columns(GtkTreeModel *, GtkTreeIter *, GtkTreeIter *, gpointer);
@@ -338,7 +339,7 @@ static void g_strings_panel_init(GStringsPanel *panel)
     g_generic_config_get_value(get_main_configuration(), MPK_DISPLAY_ON_SEL, &display);
 
     if (display)
-        g_signal_connect(G_OBJECT(select), "changed", G_CALLBACK(on_strings_selection_change), panel);
+        g_signal_connect(G_OBJECT(select), "changed", G_CALLBACK(on_strings_selection_change), NULL);
 
     /* Préparation du menu contextuel */
 
@@ -572,7 +573,7 @@ static void change_strings_panel_current_binary(GStringsPanel *panel, GLoadedBin
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : selection = sélection modifiée.                              *
-*                panel     = structure contenant les informations maîtresses. *
+*                unused    = adresse non utilisée ici.                        *
 *                                                                             *
 *  Description : Réagit au changement de sélection des chaînes textuelles.    *
 *                                                                             *
@@ -582,7 +583,7 @@ static void change_strings_panel_current_binary(GStringsPanel *panel, GLoadedBin
 *                                                                             *
 ******************************************************************************/
 
-static void on_strings_selection_change(GtkTreeSelection *selection, GStringsPanel *panel)
+static void on_strings_selection_change(GtkTreeSelection *selection, gpointer unused)
 {
     GtkTreeIter iter;                       /* Point de sélection          */
     GtkTreeModel *model;                    /* Modèle de gestion           */
@@ -596,8 +597,9 @@ static void on_strings_selection_change(GtkTreeSelection *selection, GStringsPan
 
         addr = get_mrange_addr(g_binary_symbol_get_range(symbol));
 
-        display = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
+        display = get_current_view();
         gtk_display_panel_request_move(display, addr);
+        g_object_unref(G_OBJECT(display));
 
         g_object_unref(G_OBJECT(symbol));
 
@@ -835,8 +837,9 @@ static gboolean on_button_event_over_strings(GtkWidget *widget, GdkEventButton *
 
                 addr = get_mrange_addr(g_binary_symbol_get_range(symbol));
 
-                display = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
+                display = get_current_view();
                 gtk_display_panel_request_move(display, addr);
+                g_object_unref(G_OBJECT(display));
 
                 g_object_unref(G_OBJECT(symbol));
 
@@ -1042,7 +1045,7 @@ static void mcb_strings_panel_find_refs(GtkMenuItem *menuitem, GStringsPanel *pa
 
     range = g_binary_symbol_get_range(symbol);
 
-    binary = g_editor_item_get_current_binary(G_EDITOR_ITEM(panel));
+    binary = get_current_binary();
     proc = g_loaded_binary_get_processor(binary);
 
     /**
@@ -1059,8 +1062,9 @@ static void mcb_strings_panel_find_refs(GtkMenuItem *menuitem, GStringsPanel *pa
     {
         addr = get_address_from_gotox_dialog(dialog);
 
-        display = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
+        display = get_current_view();
         gtk_display_panel_request_move(display, addr);
+        g_object_unref(G_OBJECT(display));
 
         delete_vmpa(addr);
 
@@ -1072,6 +1076,7 @@ static void mcb_strings_panel_find_refs(GtkMenuItem *menuitem, GStringsPanel *pa
         g_object_unref(G_OBJECT(instr));
 
     g_object_unref(G_OBJECT(proc));
+    g_object_unref(G_OBJECT(binary));
 
     g_object_unref(G_OBJECT(symbol));