diff options
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/Makefile.am | 9 | ||||
| -rw-r--r-- | src/gui/dialogs/export_disass.c | 1 | ||||
| -rw-r--r-- | src/gui/dialogs/gotox.c | 1 | ||||
| -rw-r--r-- | src/gui/dialogs/loading.c | 8 |
4 files changed, 7 insertions, 12 deletions
diff --git a/src/gui/dialogs/Makefile.am b/src/gui/dialogs/Makefile.am index a8e7b93..5716f14 100644 --- a/src/gui/dialogs/Makefile.am +++ b/src/gui/dialogs/Makefile.am @@ -31,7 +31,7 @@ libguidialogs_la_SOURCES = \ snapshots.h snapshots.c \ storage.h storage.c -libguidialogs_la_LDFLAGS = +libguidialogs_la_CFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%) @@ -39,13 +39,6 @@ devdir = $(includedir)/chrysalide/$(subdir:src/%=core/%) dev_HEADERS = $(libguidialogs_la_SOURCES:%c=) -AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) - -AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) - -SUBDIRS = - - resources.c: gresource.xml $(UI_FILES) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name gui_dialogs gresource.xml diff --git a/src/gui/dialogs/export_disass.c b/src/gui/dialogs/export_disass.c index 12fc51f..911e345 100644 --- a/src/gui/dialogs/export_disass.c +++ b/src/gui/dialogs/export_disass.c @@ -36,6 +36,7 @@ #include "../core/global.h" #include "../../common/extstr.h" +#include "../../core/columns.h" #include "../../core/global.h" #include "../../core/logs.h" #include "../../core/queue.h" diff --git a/src/gui/dialogs/gotox.c b/src/gui/dialogs/gotox.c index 2179960..9a8a1d2 100644 --- a/src/gui/dialogs/gotox.c +++ b/src/gui/dialogs/gotox.c @@ -31,6 +31,7 @@ #include <i18n.h> +#include "../../core/columns.h" #include "../../core/paths.h" #include "../../format/format.h" #include "../../format/symiter.h" diff --git a/src/gui/dialogs/loading.c b/src/gui/dialogs/loading.c index 912eb8d..39c5820 100644 --- a/src/gui/dialogs/loading.c +++ b/src/gui/dialogs/loading.c @@ -459,7 +459,7 @@ void add_content_to_loading_dialog(GtkBuilder *builder, GLoadedContent *content, { GtkListStore *store; /* Modèle de gestion */ char *desc; /* Description d'un contenu */ - char *format; /* Format associé à un contenu */ + char *class; /* Format associé à un contenu */ char *name; /* Désignation complète */ gboolean recognized; /* Nature du contenu */ GtkTreeIter iter; /* Point d'insertion */ @@ -476,11 +476,11 @@ void add_content_to_loading_dialog(GtkBuilder *builder, GLoadedContent *content, /* Inscription */ desc = g_loaded_content_describe(content, false); - format = g_loaded_content_get_format_name(content); + class = g_loaded_content_get_content_class(content, true); - asprintf(&name, "%s (%s)", desc, format); + asprintf(&name, "%s (%s)", desc, class); - free(format); + free(class); free(desc); recognized = TRUE; |