Cleaned editor items by removing a direct link to the main window.

1 files changed, 19 insertions, 14 deletions

diff --git a/src/gui/menus/options.c b/src/gui/menus/options.c
index 3702d42..065f4f5 100644
--- a/src/gui/menus/options.c
+++ b/src/gui/menus/options.c
@@ -29,6 +29,7 @@
 
 
 #include "../editem-int.h"
+#include "../core/global.h"
 #include "../dialogs/identity.h"
 #include "../dialogs/preferences.h"
 #include "../../gtkext/easygtk.h"
@@ -36,10 +37,10 @@
 
 
 /* Réagit au menu "Options -> Préférences". */
-static void mcb_options_preferences(GtkMenuItem *, GMenuBar *);
+static void mcb_options_preferences(GtkMenuItem *, gpointer);
 
 /* Réagit au menu "Options -> Identité". */
-static void mcb_options_identity(GtkMenuItem *, GMenuBar *);
+static void mcb_options_identity(GtkMenuItem *, gpointer);
 
 
 
@@ -68,11 +69,11 @@ GtkWidget *build_menu_options(GObject *ref, GMenuBar *bar)
     menubar = qck_create_menu(GTK_MENU_ITEM(result));
 
     submenuitem = qck_create_menu_item(ref, "mnu_options_preferences", _("Preferences"),
-                                       G_CALLBACK(mcb_options_preferences), bar);
+                                       G_CALLBACK(mcb_options_preferences), NULL);
     gtk_container_add(GTK_CONTAINER(menubar), submenuitem);
 
     submenuitem = qck_create_menu_item(ref, "mnu_options_identity", _("Identity"),
-                                       G_CALLBACK(mcb_options_identity), bar);
+                                       G_CALLBACK(mcb_options_identity), NULL);
     gtk_container_add(GTK_CONTAINER(menubar), submenuitem);
 
     return result;
@@ -83,7 +84,7 @@ GtkWidget *build_menu_options(GObject *ref, GMenuBar *bar)
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : menuitem = élément de menu sélectionné.                      *
-*                bar      = barre de menu parente.                            *
+*                unused   = adresse non utilisée ici.                         *
 *                                                                             *
 *  Description : Réagit au menu "Options -> Préférences".                     *
 *                                                                             *
@@ -93,15 +94,15 @@ GtkWidget *build_menu_options(GObject *ref, GMenuBar *bar)
 *                                                                             *
 ******************************************************************************/
 
-static void mcb_options_preferences(GtkMenuItem *menuitem, GMenuBar *bar)
+static void mcb_options_preferences(GtkMenuItem *menuitem, gpointer unused)
 {
-    GObject *ref;                           /* Espace de référencements    */
+    GtkWindow *editor;                      /* Fenêtre graphique principale*/
     GtkBuilder *builder;                    /* Constructeur utilisé        */
     GtkWidget *dialog;                      /* Boîte de dialogue à montrer */
 
-    ref = g_editor_item_get_global_ref(G_EDITOR_ITEM(bar));
+    editor = get_editor_window();
 
-    dialog = create_preferences_dialog(GTK_WINDOW(ref), &builder);
+    dialog = create_preferences_dialog(editor, &builder);
 
     gtk_dialog_run(GTK_DIALOG(dialog));
 
@@ -109,13 +110,15 @@ static void mcb_options_preferences(GtkMenuItem *menuitem, GMenuBar *bar)
 
     g_object_unref(G_OBJECT(builder));
 
+    g_object_unref(G_OBJECT(editor));
+
 }
 
 
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : menuitem = élément de menu sélectionné.                      *
-*                bar      = barre de menu parente.                            *
+*                unused   = adresse non utilisée ici.                         *
 *                                                                             *
 *  Description : Réagit au menu "Options -> Identité".                        *
 *                                                                             *
@@ -125,15 +128,15 @@ static void mcb_options_preferences(GtkMenuItem *menuitem, GMenuBar *bar)
 *                                                                             *
 ******************************************************************************/
 
-static void mcb_options_identity(GtkMenuItem *menuitem, GMenuBar *bar)
+static void mcb_options_identity(GtkMenuItem *menuitem, gpointer unused)
 {
-    GObject *ref;                           /* Espace de référencements    */
+    GtkWindow *editor;                      /* Fenêtre graphique principale*/
     GtkBuilder *builder;                    /* Constructeur utilisé        */
     GtkWidget *dialog;                      /* Boîte de dialogue à montrer */
 
-    ref = g_editor_item_get_global_ref(G_EDITOR_ITEM(bar));
+    editor = get_editor_window();
 
-    dialog = create_identity_dialog(GTK_WINDOW(ref), &builder);
+    dialog = create_identity_dialog(editor, &builder);
 
     gtk_dialog_run(GTK_DIALOG(dialog));
 
@@ -141,4 +144,6 @@ static void mcb_options_identity(GtkMenuItem *menuitem, GMenuBar *bar)
 
     g_object_unref(G_OBJECT(builder));
 
+    g_object_unref(G_OBJECT(editor));
+
 }