summaryrefslogtreecommitdiff
path: root/src/analysis/db/items
diff options
context:
space:
mode:
Diffstat (limited to 'src/analysis/db/items')
-rw-r--r--src/analysis/db/items/Makefile.am11
-rw-r--r--src/analysis/db/items/bookmark.c8
-rw-r--r--src/analysis/db/items/comment.c10
-rw-r--r--src/analysis/db/items/move.c20
-rw-r--r--src/analysis/db/items/switcher.c8
5 files changed, 28 insertions, 29 deletions
diff --git a/src/analysis/db/items/Makefile.am b/src/analysis/db/items/Makefile.am
index b9ce117..f8f70d5 100644
--- a/src/analysis/db/items/Makefile.am
+++ b/src/analysis/db/items/Makefile.am
@@ -7,18 +7,9 @@ libanalysisdbitems_la_SOURCES = \
move.h move.c \
switcher.h switcher.c
-libanalysisdbitems_la_LIBADD =
-
-libanalysisdbitems_la_LDFLAGS =
+libanalysisdbitems_la_CFLAGS = $(TOOLKIT_CFLAGS) $(LIBXML_CFLAGS) $(LIBSQLITE_CFLAGS)
devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%)
dev_HEADERS = $(libanalysisdbitems_la_SOURCES:%c=)
-
-
-AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBARCHIVE_CFLAGS) $(LIBSQLITE_CFLAGS)
-
-AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
-
-SUBDIRS =
diff --git a/src/analysis/db/items/bookmark.c b/src/analysis/db/items/bookmark.c
index 0a64c89..3610d96 100644
--- a/src/analysis/db/items/bookmark.c
+++ b/src/analysis/db/items/bookmark.c
@@ -81,10 +81,10 @@ static gboolean g_db_bookmark_cmp_key(const GDbBookmark *, const GDbBookmark *);
static gint g_db_bookmark_cmp(const GDbBookmark *, const GDbBookmark *);
/* Importe la définition d'un signet dans un flux réseau. */
-static bool g_db_bookmark_unpack(GDbBookmark *, packed_buffer *);
+static bool g_db_bookmark_unpack(GDbBookmark *, packed_buffer_t *);
/* Exporte la définition d'un signet dans un flux réseau. */
-static bool g_db_bookmark_pack(const GDbBookmark *, packed_buffer *);
+static bool g_db_bookmark_pack(const GDbBookmark *, packed_buffer_t *);
/* Construit la description humaine d'un signet sur un tampon. */
static char *g_db_bookmark_build_label(const GDbBookmark *);
@@ -412,7 +412,7 @@ static gint g_db_bookmark_cmp(const GDbBookmark *a, const GDbBookmark *b)
* *
******************************************************************************/
-static bool g_db_bookmark_unpack(GDbBookmark *bookmark, packed_buffer *pbuf)
+static bool g_db_bookmark_unpack(GDbBookmark *bookmark, packed_buffer_t *pbuf)
{
bool result; /* Bilan à retourner */
@@ -442,7 +442,7 @@ static bool g_db_bookmark_unpack(GDbBookmark *bookmark, packed_buffer *pbuf)
* *
******************************************************************************/
-static bool g_db_bookmark_pack(const GDbBookmark *bookmark, packed_buffer *pbuf)
+static bool g_db_bookmark_pack(const GDbBookmark *bookmark, packed_buffer_t *pbuf)
{
bool result; /* Bilan à retourner */
diff --git a/src/analysis/db/items/comment.c b/src/analysis/db/items/comment.c
index bdff3a6..fb27f60 100644
--- a/src/analysis/db/items/comment.c
+++ b/src/analysis/db/items/comment.c
@@ -39,9 +39,9 @@
#include "../../human/asm/lang.h"
#include "../../../common/array.h"
#include "../../../common/extstr.h"
+#include "../../../core/columns.h"
#include "../../../glibext/gbinarycursor.h"
#include "../../../glibext/linegen-int.h"
-#include "../../../gtkext/gtkblockdisplay.h"
@@ -94,10 +94,10 @@ static gboolean g_db_comment_cmp_key(const GDbComment *, const GDbComment *);
static gint g_db_comment_cmp(const GDbComment *, const GDbComment *);
/* Importe la définition d'un commentaire dans un flux réseau. */
-static bool g_db_comment_unpack(GDbComment *, packed_buffer *);
+static bool g_db_comment_unpack(GDbComment *, packed_buffer_t *);
/* Exporte la définition d'un commentaire dans un flux réseau. */
-static bool g_db_comment_pack(GDbComment *, packed_buffer *);
+static bool g_db_comment_pack(GDbComment *, packed_buffer_t *);
/* Construit la description humaine d'un commentaire. */
static char *g_db_comment_build_label(GDbComment *);
@@ -570,7 +570,7 @@ static gint g_db_comment_cmp(const GDbComment *a, const GDbComment *b)
* *
******************************************************************************/
-static bool g_db_comment_unpack(GDbComment *comment, packed_buffer *pbuf)
+static bool g_db_comment_unpack(GDbComment *comment, packed_buffer_t *pbuf)
{
bool result; /* Bilan à retourner */
uint8_t tmp8; /* Valeur sur 8 bits */
@@ -623,7 +623,7 @@ static bool g_db_comment_unpack(GDbComment *comment, packed_buffer *pbuf)
* *
******************************************************************************/
-static bool g_db_comment_pack(GDbComment *comment, packed_buffer *pbuf)
+static bool g_db_comment_pack(GDbComment *comment, packed_buffer_t *pbuf)
{
bool result; /* Bilan à retourner */
rle_string text; /* Texte brut récupéré */
diff --git a/src/analysis/db/items/move.c b/src/analysis/db/items/move.c
index f70de6f..e4f503b 100644
--- a/src/analysis/db/items/move.c
+++ b/src/analysis/db/items/move.c
@@ -35,9 +35,13 @@
#include "../collection-int.h"
#include "../item-int.h"
-#include "../../../gui/core/global.h"
+#ifdef INCLUDE_GTK_SUPPORT
+# include "../../../gui/core/global.h"
+#endif
#include "../../../glibext/gbinarycursor.h"
-#include "../../../glibext/gloadedpanel.h"
+#ifdef INCLUDE_GTK_SUPPORT
+# include "../../../glibext/gloadedpanel.h"
+#endif
@@ -78,10 +82,10 @@ static void g_db_move_finalize(GDbMove *);
static gint g_db_move_cmp(const GDbMove *, const GDbMove *);
/* Importe la définition d'un déplacement depuis un flux réseau. */
-static bool g_db_move_unpack(GDbMove *, packed_buffer *);
+static bool g_db_move_unpack(GDbMove *, packed_buffer_t *);
/* Exporte la définition d'un déplacement dans un flux réseau. */
-static bool g_db_move_pack(const GDbMove *, packed_buffer *);
+static bool g_db_move_pack(const GDbMove *, packed_buffer_t *);
/* Construit la description humaine d'un déplacement. */
static char *g_db_move_build_label(GDbMove *);
@@ -314,7 +318,7 @@ static gint g_db_move_cmp(const GDbMove *a, const GDbMove *b)
* *
******************************************************************************/
-static bool g_db_move_unpack(GDbMove *move, packed_buffer *pbuf)
+static bool g_db_move_unpack(GDbMove *move, packed_buffer_t *pbuf)
{
bool result; /* Bilan à retourner */
@@ -347,7 +351,7 @@ static bool g_db_move_unpack(GDbMove *move, packed_buffer *pbuf)
* *
******************************************************************************/
-static bool g_db_move_pack(const GDbMove *move, packed_buffer *pbuf)
+static bool g_db_move_pack(const GDbMove *move, packed_buffer_t *pbuf)
{
bool result; /* Bilan à retourner */
@@ -410,6 +414,8 @@ static char *g_db_move_build_label(GDbMove *move)
static bool g_db_move_run(const GDbMove *move, GLineCursor *cursor)
{
+#ifdef INCLUDE_GTK_SUPPORT
+
GLoadedPanel *panel; /* Afficheur effectif de code */
typedef struct _move_params
@@ -465,6 +471,8 @@ static bool g_db_move_run(const GDbMove *move, GLineCursor *cursor)
if (panel != NULL)
g_object_unref(G_OBJECT(panel));
+#endif
+
return true;
}
diff --git a/src/analysis/db/items/switcher.c b/src/analysis/db/items/switcher.c
index 090b8ce..885406c 100644
--- a/src/analysis/db/items/switcher.c
+++ b/src/analysis/db/items/switcher.c
@@ -84,10 +84,10 @@ static gboolean g_db_switcher_cmp_key(const GDbSwitcher *, const GDbSwitcher *);
static gint g_db_switcher_cmp(const GDbSwitcher *, const GDbSwitcher *);
/* Importe la définition d'un signet depuis un flux réseau. */
-static bool g_db_switcher_unpack(GDbSwitcher *, packed_buffer *);
+static bool g_db_switcher_unpack(GDbSwitcher *, packed_buffer_t *);
/* Exporte la définition d'un signet dans un flux réseau. */
-static bool g_db_switcher_pack(const GDbSwitcher *, packed_buffer *);
+static bool g_db_switcher_pack(const GDbSwitcher *, packed_buffer_t *);
/* Construit la description humaine d'un signet sur un tampon. */
static char *g_db_switcher_build_label(GDbSwitcher *);
@@ -448,7 +448,7 @@ static gint g_db_switcher_cmp(const GDbSwitcher *a, const GDbSwitcher *b)
* *
******************************************************************************/
-static bool g_db_switcher_unpack(GDbSwitcher *switcher, packed_buffer *pbuf)
+static bool g_db_switcher_unpack(GDbSwitcher *switcher, packed_buffer_t *pbuf)
{
bool result; /* Bilan à retourner */
uint32_t tmp32; /* Valeur sur 32 bits */
@@ -489,7 +489,7 @@ static bool g_db_switcher_unpack(GDbSwitcher *switcher, packed_buffer *pbuf)
* *
******************************************************************************/
-static bool g_db_switcher_pack(const GDbSwitcher *switcher, packed_buffer *pbuf)
+static bool g_db_switcher_pack(const GDbSwitcher *switcher, packed_buffer_t *pbuf)
{
bool result; /* Bilan à retourner */
generated by cgit v0.11.2-87-g4458 at 2025-07-09 23:49:44 (GMT)