adding files that weren't up to date

git-svn-id: file:///svnroot/mdictionary/trunk@48 5bde0345-f819-0410-ac75-e5045f9217cc

diff --git a/data/package_contents/whitestork/DEBIAN/control b/data/package_contents/whitestork/DEBIAN/control
index 0cb2af1..02e7fda 100644 (file)
--- a/data/package_contents/whitestork/DEBIAN/control
+++ b/data/package_contents/whitestork/DEBIAN/control
@@ -7,10 +7,13 @@ Installed-Size:
 Depends: libexpat1 (>= 1.95.8)        
 Maintainer: ComArch S.A. <contact@comarch.com>
 Description: Multilingual dictionary.
- This dictionary have a modular build so you
- can download many dictionary engines and dictionaries.
- Furthemore, you can change Your Graphical Interface
- if You find one more prefereable by You.
+ WhiteStork Multilingual Dictionary is a very functional
+ application allowing the use of many dictionary engines.
+ You can either download them from our homepage at 
+ http://garage.maemo.org, or write your own, provided
+ that You stick to the API (also available on our homepage).
+ The graphical user interface of our application can also 
+ be replaced by a product of Your own programming skills.
  Copyright 2006, ComArch S.A. 
 Maemo-Icon-26: 
  iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI

diff --git a/include/dictionary_engine.h b/include/dictionary_engine.h
index 53ab626..7877c82 100644 (file)
--- a/include/dictionary_engine.h
+++ b/include/dictionary_engine.h
@@ -37,6 +37,9 @@ Copyright 2006 ComArch S.A.
        #define eg_critical(frm,...) while(FALSE)
 #endif
 
+#define eg_malloc(n)   g_try_malloc0(n)
+#define eg_free(n)     g_free(n); n = NULL
+
 //______________________________________________________________________________
 // *****************************************************************************
 //************************************************************* HEADERS SECTION:
@@ -63,7 +66,7 @@ Copyright 2006 ComArch S.A.
                         ( (module).engine_version() )
 //------------------------------------------------------------------------------
 #define         dict_eng_module_get_format(module)   \
-                        ( (module).engine_format() )
+                        ( (module).engine_version() )
 //------------------------------------------------------------------------------
 #define         dict_eng_module_create(module,location,flags)   \
         ( (module).engine_create(  (location), (flags), NULL, NULL, 0.01 ) )
@@ -94,7 +97,7 @@ Copyright 2006 ComArch S.A.
                                                               (val)            \
                                                             ))
 //------------------------------------------------------------------------------
-#define         dict_eng_set_auto_free(engine, state) ( \
+#define         dict_eng_set_auto_free(engine, state)  \
                         (engine) -> engine_set_auto_free( (engine), (state) )
 //------------------------------------------------------------------------------
 #define         dict_eng_optimize(engine)  \
@@ -193,6 +196,8 @@ typedef enum
         ENGINE_NO_ERROR = 0,
         ENGINE_WRONG_FILE,
         ENGINE_COULDNT_READ,
+       ENGINE_COULDNT_WRITE,
+       ENGINE_INTERNAL_ERROR,
         ENGINE_NO_FILE,     
         ENGINE_OUT_OF_MEMORY
 }

diff --git a/src/gui/include/ws_version.h b/src/gui/include/ws_version.h
deleted file mode 100644 (file)
index 994f3bf..0000000
--- a/src/gui/include/ws_version.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef _VERSION_H
-#define _VERSION_H
-
-#define WS_VERSION "0.6."
-#endif