aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBertrand Jacquin (Beber) <beber@setibzh.com>2006-01-26 20:51:21 +0100
committerBertrand Jacquin (Beber) <beber@setibzh.com>2006-01-26 20:51:21 +0100
commit0f66254b5f619b408c47508185f06f6e1f83a905 (patch)
treeca9dc2b38f0c4edc5b6e244b2680d3bcb632ec5b
parentlocal grimoire of code fixing (diff)
downloadensorcel-0f66254b5f619b408c47508185f06f6e1f83a905.tar.gz
Change to don't requiere a sourcemage
Blank line fixex
-rw-r--r--data/grimoire2
-rw-r--r--src/.svnignore5
-rw-r--r--src/ensorcel.h2
-rw-r--r--src/ensorcel_config.h14
-rw-r--r--src/ensorcel_grimoire_list.c11
-rw-r--r--src/ensorcel_info_get.c2
-rw-r--r--src/ensorcel_spell.c3
-rw-r--r--src/ensorcel_tree_create.c7
8 files changed, 18 insertions, 28 deletions
diff --git a/data/grimoire b/data/grimoire
index 87c50df..02c0a9b 100644
--- a/data/grimoire
+++ b/data/grimoire
@@ -1 +1 @@
-GRIMOIRE_DIR[1]=../test
+GRIMOIRE_DIR[1]=test
diff --git a/src/.svnignore b/src/.svnignore
deleted file mode 100644
index f0ddb67..0000000
--- a/src/.svnignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.in
-.deps
-Makefile
-bintest
-ensorcel
diff --git a/src/ensorcel.h b/src/ensorcel.h
index 14bca04..3ca84dc 100644
--- a/src/ensorcel.h
+++ b/src/ensorcel.h
@@ -3,7 +3,6 @@
#define _UNUSED_ __attribute__((unused))
-
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
@@ -19,6 +18,7 @@
#define LECTURE 0
#define ECRITURE 1
+
/* ENSORCEL STRUCTURES AND TYPE DEFINITIONS */
typedef struct _Ensorcel_Exe_Strings Ensorcel_Exe_Strings;
diff --git a/src/ensorcel_config.h b/src/ensorcel_config.h
index bf25a48..bb26ab0 100644
--- a/src/ensorcel_config.h
+++ b/src/ensorcel_config.h
@@ -1,20 +1,22 @@
/* IMAGES */
-#define DATAPATH "data/"
+#define DATAPATH "data/"
+#define SPELLPATH "test/"
-#define CROW DATAPATH"images/crow.png"
+#define CROW DATAPATH"images/crow.png"
#define LOGOENSORCEL DATAPATH"images/logo.png"
#define IMGEXITSORCEL DATAPATH"images/exit.png"
#define IMGOKENSORCEL DATAPATH"images/ok.png"
#define IMGABOUTSORCEL DATAPATH"images/about.png"
#define LOGOSMGLENSORCEL DATAPATH"images/smgl_long_logo.png"
#define LOGOSPELLENSORCEL DATAPATH"images/spell_logo.png"
-#define LOGOGRIMOIREENSORCEL DATAPATH"images/grimoire.png"
-#define ENSORCELLOGOOPTIONSTITLE DATAPATH"images/sorcery_options.png"
+#define LOGOGRIMOIREENSORCEL DATAPATH"images/grimoire.png"
+#define ENSORCELLOGOOPTIONSTITLE DATAPATH"images/sorcery_options.png"
#define ENSORCELMAXLINE 80
+
#define TRUE 1
#define FALSE 0
/* GRIMOIRE CONFIGURATION */
-#define ENSORCELGRIMOIREFILE "/etc/sorcery/local/grimoire"
-#define ENSORCELPACKAGEFILE "/var/state/sorcery/packages"
+#define ENSORCELGRIMOIREFILE DATAPATH"grimoire"
+#define ENSORCELPACKAGEFILE DATAPATH"packages"
#define ENSORCELDETAILSFILENAME "DETAILS"
diff --git a/src/ensorcel_grimoire_list.c b/src/ensorcel_grimoire_list.c
index c907ac9..54ebd99 100644
--- a/src/ensorcel_grimoire_list.c
+++ b/src/ensorcel_grimoire_list.c
@@ -1,15 +1,6 @@
#include "ensorcel.h"
-
-/*
- *
- * CODE NOT USED ...
- *
- *
- */
-
-
-
+/* CODE NOT USED ... */
Ecore_DList *ensorcel_grimoire_dlist_new ()
{
diff --git a/src/ensorcel_info_get.c b/src/ensorcel_info_get.c
index 02017c3..c9ee129 100644
--- a/src/ensorcel_info_get.c
+++ b/src/ensorcel_info_get.c
@@ -201,7 +201,7 @@ char *ensorcel_spell_description_get (char *name)
char cmd[80];
char *output;
-/ sprintf (cmd, "gaze -q what %s", name);
+ sprintf (cmd, "ls -l /tmp", name);
output = ensorcel_cmd_run(cmd);
printf("DEBUG : LANCEMENT DE %s\n\n\n",cmd);
diff --git a/src/ensorcel_spell.c b/src/ensorcel_spell.c
index 82a3752..e774e2d 100644
--- a/src/ensorcel_spell.c
+++ b/src/ensorcel_spell.c
@@ -33,13 +33,11 @@ static void _ensorcel_tree_row_selected (Etk_Object * object, Etk_Tree_Row * row
static void _ensorcel_tree_row_unselected (Etk_Object * object, Etk_Tree_Row * row,
void *data _UNUSED_)
{
-
printf ("Row Unselected %p %p \n", object, row);
}
Ensorcel_Tree_Skel *ensorcel_spell_tree_create ()
{
-
Ensorcel_Tree_Skel *tree_skel;
tree_skel =
@@ -130,7 +128,6 @@ void ensorcel_spell_window_create (void *data _UNUSED_)
/* RADIO BUTTONS TABLE CREATION */
rd_table = ensorcel_radion_button_table_create (num_bt_rd, rd_button_set);
-
/* Note Book */
note_book = etk_notebook_new ();
etk_widget_size_request_set (ETK_WIDGET (note_book), 500, 600);
diff --git a/src/ensorcel_tree_create.c b/src/ensorcel_tree_create.c
index cd15611..3a47ff5 100644
--- a/src/ensorcel_tree_create.c
+++ b/src/ensorcel_tree_create.c
@@ -8,15 +8,20 @@ int ensorcel_grimoire_row_create (Ensorcel_Tree_Skel * Tree_Skel)
char sep = '=';
if (!ecore_file_exists (ENSORCELGRIMOIREFILE))
+ {
+ printf ("no %s found\n", ENSORCELGRIMOIREFILE);
return (EXIT_FAILURE);
+ }
fd = fopen (ENSORCELGRIMOIREFILE, "r");
if (!fd)
+ {
+ printf ("%s can't be opened\n", ENSORCELGRIMOIREFILE);
return (EXIT_FAILURE);
+ }
while (!feof (fd))
{
-
if (!fgets (line, sizeof (line), fd))
break;
ptr = strchr (line, sep) + 1;