Given the priority to string.h from system includes.

8 files changed, 19 insertions, 178 deletions

diff --git a/plugins/pychrysalide/gui/Makefile.am b/plugins/pychrysalide/gui/Makefile.am
index 2579887..f471a60 100644
--- a/plugins/pychrysalide/gui/Makefile.am
+++ b/plugins/pychrysalide/gui/Makefile.am
@@ -3,11 +3,11 @@ noinst_LTLIBRARIES = libpychrysagui.la
 
 libpychrysagui_la_SOURCES =				\
 	editem.h editem.c					\
-	module.h module.c
+	module.h module.c					\
+	panel.h panel.c
 
 libpychrysagui_la_LIBADD =				\
-	core/libpychrysaguicore.la			\
-	panels/libpychrysaguipanels.la
+	core/libpychrysaguicore.la
 
 libpychrysagui_la_LDFLAGS = 
 
@@ -22,4 +22,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJE
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
-SUBDIRS = core panels
+SUBDIRS = core
diff --git a/plugins/pychrysalide/gui/core/panels.c b/plugins/pychrysalide/gui/core/panels.c
index 3b88b18..3a3001c 100644
--- a/plugins/pychrysalide/gui/core/panels.c
+++ b/plugins/pychrysalide/gui/core/panels.c
@@ -32,9 +32,9 @@
 #include <gui/core/panels.h>
 
 
+#include "../panel.h"
 #include "../../access.h"
 #include "../../helpers.h"
-#include "../panels/panel.h"
 
 
 
diff --git a/plugins/pychrysalide/gui/module.c b/plugins/pychrysalide/gui/module.c
index abd9c0a..59fb39f 100644
--- a/plugins/pychrysalide/gui/module.c
+++ b/plugins/pychrysalide/gui/module.c
@@ -30,8 +30,8 @@
 
 
 #include "editem.h"
+#include "panel.h"
 #include "core/module.h"
-#include "panels/module.h"
 #include "../helpers.h"
 
 
@@ -69,7 +69,6 @@ bool add_gui_module(PyObject *super)
     result = (module != NULL);
 
     if (result) result = add_gui_core_module(module);
-    if (result) result = add_gui_panels_module(module);
 
     if (!result)
         Py_XDECREF(module);
@@ -98,9 +97,9 @@ bool populate_gui_module(void)
     result = true;
 
     if (result) result = ensure_python_editor_item_is_registered();
+    if (result) result = ensure_python_panel_item_is_registered();
 
     if (result) result = populate_gui_core_module();
-    if (result) result = populate_gui_panels_module();
 
     assert(result);
 
diff --git a/plugins/pychrysalide/gui/panels/panel.c b/plugins/pychrysalide/gui/panel.c
index 2d0b562..ccc4dc5 100644
--- a/plugins/pychrysalide/gui/panels/panel.c
+++ b/plugins/pychrysalide/gui/panel.c
@@ -30,15 +30,15 @@
 
 #include <i18n.h>
 #include <core/params.h>
+#include <gui/panel-int.h>
 #include <gui/core/panels.h>
-#include <gui/panels/panel-int.h>
 #include <plugins/dt.h>
 
 
-#include "../editem.h"
-#include "../../access.h"
-#include "../../helpers.h"
-#include "../../gtkext/dockable.h"
+#include "editem.h"
+#include "../access.h"
+#include "../helpers.h"
+#include "../gtkext/dockable.h"
 
 
 
@@ -291,7 +291,7 @@ PyTypeObject *get_python_panel_item_type(void)
 
         PyVarObject_HEAD_INIT(NULL, 0)
 
-        .tp_name        = "pychrysalide.gui.panels.PanelItem",
+        .tp_name        = "pychrysalide.gui.PanelItem",
         .tp_basicsize   = sizeof(PyGObject),
 
         .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
@@ -364,7 +364,7 @@ bool ensure_python_panel_item_is_registered(void)
 
     if (!PyType_HasFeature(type, Py_TPFLAGS_READY))
     {
-        module = get_access_to_python_module("pychrysalide.gui.panels");
+        module = get_access_to_python_module("pychrysalide.gui");
 
         dict = PyModule_GetDict(module);
 
diff --git a/plugins/pychrysalide/gui/panels/panel.h b/plugins/pychrysalide/gui/panel.h
index 907c650..9cd73eb 100644
--- a/plugins/pychrysalide/gui/panels/panel.h
+++ b/plugins/pychrysalide/gui/panel.h
@@ -1,6 +1,6 @@
 
 /* Chrysalide - Outil d'analyse de fichiers binaires
- * panel.h - prototypes pour l'équivalent Python du fichier "gui/panels/panel.h"
+ * panel.h - prototypes pour l'équivalent Python du fichier "gui/panel.h"
  *
  * Copyright (C) 2012-2017 Cyrille Bagard
  *
@@ -22,8 +22,8 @@
  */
 
 
-#ifndef _PLUGINS_PYCHRYSALIDE_GUI_PANELS_PANEL_H
-#define _PLUGINS_PYCHRYSALIDE_GUI_PANELS_PANEL_H
+#ifndef _PLUGINS_PYCHRYSALIDE_GUI_PANEL_H
+#define _PLUGINS_PYCHRYSALIDE_GUI_PANEL_H
 
 
 #include <Python.h>
@@ -34,7 +34,7 @@
 /* Fournit un accès à une définition de type à diffuser. */
 PyTypeObject *get_python_panel_item_type(void);
 
-/* Prend en charge l'objet 'pychrysalide.gui.panels.PanelItem'. */
+/* Prend en charge l'objet 'pychrysalide.gui.PanelItem'. */
 bool ensure_python_panel_item_is_registered(void);
 
 /* Tente de convertir en panneau pour GUI. */
@@ -42,4 +42,4 @@ int convert_to_panel_item(PyObject *, void *);
 
 
 
-#endif  /* _PLUGINS_PYCHRYSALIDE_GUI_PANELS_PANEL_H */
+#endif  /* _PLUGINS_PYCHRYSALIDE_GUI_PANEL_H */
diff --git a/plugins/pychrysalide/gui/panels/Makefile.am b/plugins/pychrysalide/gui/panels/Makefile.am
deleted file mode 100644
index ec5522f..0000000
--- a/plugins/pychrysalide/gui/panels/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-
-noinst_LTLIBRARIES = libpychrysaguipanels.la
-
-libpychrysaguipanels_la_SOURCES =		\
-	module.h module.c					\
-	panel.h panel.c
-
-libpychrysaguipanels_la_LDFLAGS = 
-
-
-devdir = $(includedir)/chrysalide-$(subdir)
-
-dev_HEADERS = $(libpychrysaguipanels_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
-	-I$(top_srcdir)/src
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
diff --git a/plugins/pychrysalide/gui/panels/module.c b/plugins/pychrysalide/gui/panels/module.c
deleted file mode 100644
index dd6b91e..0000000
--- a/plugins/pychrysalide/gui/panels/module.c
+++ /dev/null
@@ -1,97 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * module.c - intégration du répertoire panels en tant que module
- *
- * Copyright (C) 2012-2017 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  Chrysalide is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Chrysalide is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-
-#include "module.h"
-
-
-#include <assert.h>
-
-
-#include "panel.h"
-#include "../../helpers.h"
-
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : super = module dont la définition est à compléter.           *
-*                                                                             *
-*  Description : Ajoute le module 'gui.panels' à un module Python.            *
-*                                                                             *
-*  Retour      : Bilan de l'opération.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-bool add_gui_panels_module(PyObject *super)
-{
-    bool result;                            /* Bilan à retourner           */
-    PyObject *module;                       /* Sous-module mis en place    */
-
-    static PyModuleDef py_chrysalide_gui_panels_module = {
-
-        .m_base = PyModuleDef_HEAD_INIT,
-
-        .m_name = "pychrysalide.gui.panels",
-        .m_doc = "Python module for Chrysalide.gui.panels",
-
-        .m_size = -1,
-
-    };
-
-    module = build_python_module(super, &py_chrysalide_gui_panels_module);
-
-    result = (module != NULL);
-
-    return result;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : -                                                            *
-*                                                                             *
-*  Description : Intègre les objets du module 'gui.panels'.                   *
-*                                                                             *
-*  Retour      : Bilan de l'opération.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-bool populate_gui_panels_module(void)
-{
-    bool result;                            /* Bilan à retourner           */
-
-    result = true;
-
-    if (result) result = ensure_python_panel_item_is_registered();
-
-    assert(result);
-
-    return result;
-
-}
diff --git a/plugins/pychrysalide/gui/panels/module.h b/plugins/pychrysalide/gui/panels/module.h
deleted file mode 100644
index 559a8c4..0000000
--- a/plugins/pychrysalide/gui/panels/module.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * module.h - prototypes pour l'intégration du répertoire panels en tant que module
- *
- * Copyright (C) 2012-2017 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  Chrysalide is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Chrysalide is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-
-#ifndef _PLUGINS_PYCHRYSALIDE_GUI_PANELS_MODULE_H
-#define _PLUGINS_PYCHRYSALIDE_GUI_PANELS_MODULE_H
-
-
-#include <Python.h>
-#include <stdbool.h>
-
-
-
-/* Ajoute le module 'gui.panels' à un module Python. */
-bool add_gui_panels_module(PyObject *);
-
-/* Intègre les objets du module 'gui.panels'. */
-bool populate_gui_panels_module(void);
-
-
-
-#endif  /* _PLUGINS_PYCHRYSALIDE_GUI_PANELS_MODULE_H */