diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2017-08-26 22:15:05 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2017-08-26 22:15:05 (GMT) |
| commit | 8ca477e012b11a19363542d171b8e973d637641c (patch) | |
| tree | 94a4fcde1779f031946eff7a36075f41a17cd73b /src/gui/panels/bookmarks.c | |
| parent | 4fb2ac107092671fe27fc3ebf9fc86dff7c3ec19 (diff) | |
Removed most of the functions using the editor items as global access to active items.
Diffstat (limited to 'src/gui/panels/bookmarks.c')
| -rw-r--r-- | src/gui/panels/bookmarks.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/gui/panels/bookmarks.c b/src/gui/panels/bookmarks.c index 9b360f3..20d2bd0 100644 --- a/src/gui/panels/bookmarks.c +++ b/src/gui/panels/bookmarks.c @@ -36,6 +36,7 @@ #include "panel-int.h" +#include "../core/global.h" #include "../../analysis/db/items/bookmark.h" #include "../../common/cpp.h" #include "../../common/extstr.h" @@ -119,7 +120,7 @@ static void reload_bookmarks_into_treeview(GBookmarksPanel *, GLoadedBinary *); static void on_collection_content_changed(GDbCollection *, DBAction, GDbBookmark *, GBookmarksPanel *); /* Réagit au changement de sélection des signets. */ -static void on_bookmarks_selection_change(GtkTreeSelection *, GBookmarksPanel *); +static void on_bookmarks_selection_change(GtkTreeSelection *, gpointer); @@ -337,7 +338,7 @@ static void g_bookmarks_panel_init(GBookmarksPanel *panel) select = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE); - g_signal_connect(G_OBJECT(select), "changed", G_CALLBACK(on_bookmarks_selection_change), panel); + g_signal_connect(G_OBJECT(select), "changed", G_CALLBACK(on_bookmarks_selection_change), NULL); /* Préparation du menu contextuel */ @@ -646,7 +647,7 @@ static void on_collection_content_changed(GDbCollection *collec, DBAction action /****************************************************************************** * * * 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 signets. * * * @@ -656,7 +657,7 @@ static void on_collection_content_changed(GDbCollection *collec, DBAction action * * ******************************************************************************/ -static void on_bookmarks_selection_change(GtkTreeSelection *selection, GBookmarksPanel *panel) +static void on_bookmarks_selection_change(GtkTreeSelection *selection, gpointer unused) { GtkTreeIter iter; /* Point de sélection */ GtkTreeModel *model; /* Modèle de gestion */ @@ -670,8 +671,9 @@ static void on_bookmarks_selection_change(GtkTreeSelection *selection, GBookmark addr = g_db_bookmark_get_address(bookmark); - 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(bookmark)); @@ -1061,8 +1063,9 @@ static gboolean on_button_press_over_bookmarks(GtkWidget *widget, GdkEventButton addr = g_db_bookmark_get_address(bookmark); - 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(bookmark)); |