summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2015-10-16 20:00:00 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2015-10-16 20:00:00 (GMT)
commit5fcd4f54c5ca87ca9dfd9529d7b83bbec9aff64a (patch)
tree033981b0662791abf274ad33b4f33d47c3437382 /src
parenta30fc1056877860593c19498738775c0ac43794d (diff)
Prevented some mistakes pointed by Melkor.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@599 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src')
-rw-r--r--src/core/core.c7
-rw-r--r--src/format/elf/section.c5
-rw-r--r--src/main.c5
3 files changed, 11 insertions, 6 deletions
diff --git a/src/core/core.c b/src/core/core.c
index accb3da..0460a23 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -24,10 +24,14 @@
#include "core.h"
+#include <config.h>
+
+
#include "collections.h"
#include "formats.h"
#include "params.h"
#include "processors.h"
+#include "../gtkext/support.h"
@@ -54,6 +58,9 @@ bool load_all_basic_components(void)
{
result = true;
+ add_pixmap_directory(PACKAGE_DATA_DIR);
+ add_pixmap_directory(PACKAGE_SOURCE_DIR G_DIR_SEPARATOR_S "pixmaps");
+
result &= load_main_config_parameters();
result &= g_generic_config_read(get_main_configuration());
diff --git a/src/format/elf/section.c b/src/format/elf/section.c
index 2b46d9e..60bd67a 100644
--- a/src/format/elf/section.c
+++ b/src/format/elf/section.c
@@ -93,9 +93,8 @@ bool find_elf_section_by_name(const GElfFormat *format, const char *name, elf_sh
secname = extract_name_from_elf_string_section(format, &strings,
ELF_SHDR(format, *section, sh_name));
- /* FIXME : if secname == NULL */
-
- result = (strcmp(name, secname) == 0);
+ if (secname != NULL)
+ result = (strcmp(name, secname) == 0);
}
diff --git a/src/main.c b/src/main.c
index cae6426..85e0908 100644
--- a/src/main.c
+++ b/src/main.c
@@ -36,7 +36,6 @@
#include "core/params.h"
#include "glibext/delayed.h"
#include "glibext/gbinportion.h"
-#include "gtkext/support.h"
#include "gtkext/theme.h"
#include "plugins/pglist.h"
#include "../revision.h"
@@ -127,8 +126,8 @@ int main(int argc, char **argv)
*/
/*LIBXML_TEST_VERSION*/
- add_pixmap_directory(PACKAGE_DATA_DIR);
- add_pixmap_directory(PACKAGE_SOURCE_DIR G_DIR_SEPARATOR_S "pixmaps");
+ //add_pixmap_directory(PACKAGE_DATA_DIR);
+ //add_pixmap_directory(PACKAGE_SOURCE_DIR G_DIR_SEPARATOR_S "pixmaps");
/* Création de l'interface */