Menu
▾
▴
[Gnomesword-cvs] gnomesword1/src/main bibletext.c,1.29,1.30 commentary.c,1.21,1.22 configs.c,1.4,1.5 configs.h,1.6,1.7 debug.h,1.1.1.1,1.2 dictlex.c,1.16,1.17 gbs.c,1.16,1.17 lists.h,1.5,1.6 module.c,1.9,1.10 module.h,1.6,1.7 percomm.c,1.23,1.24 search.c,1.10,1.11 search.h,1.5,1.6 settings.c,1.22,1.23 shortcutbar.c,1.10,1.11 shortcutbar.h,1.6,1.7 spell_aspell.c,1.1,1.2 spell_ispell.c,1.1,1.2 spell_pspell.c,1.2,1.3 sword.c,1.17,1.18 xml.c,1.9,1.10
Update of /cvsroot/gnomesword/gnomesword1/src/main
In directory sc8-pr-cvs1:/tmp/cvs-serv28161/src/main
Modified Files:
bibletext.c commentary.c configs.c configs.h debug.h dictlex.c
gbs.c lists.h module.c module.h percomm.c search.c search.h
settings.c shortcutbar.c shortcutbar.h spell_aspell.c
spell_ispell.c spell_pspell.c sword.c xml.c
Log Message:
word on gnome2 port
Index: bibletext.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/bibletext.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** bibletext.c 14 Aug 2003 12:31:22 -0000 1.29
--- bibletext.c 3 Sep 2003 17:52:54 -0000 1.30
***************
*** 24,28 ****
--- 24,32 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
Index: commentary.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/commentary.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** commentary.c 1 Apr 2003 18:54:18 -0000 1.21
--- commentary.c 3 Sep 2003 17:52:54 -0000 1.22
***************
*** 24,28 ****
--- 24,32 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include "main/commentary.h"
Index: configs.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/configs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configs.c 22 Jul 2003 16:05:09 -0000 1.4
--- configs.c 3 Sep 2003 17:52:54 -0000 1.5
***************
*** 24,28 ****
--- 24,32 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include "backend/config.hh"
Index: configs.h
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/configs.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configs.h 25 Jul 2003 23:35:12 -0000 1.6
--- configs.h 3 Sep 2003 17:52:54 -0000 1.7
***************
*** 26,30 ****
--- 26,34 ----
extern "C" {
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
typedef struct _mod_font MOD_FONT;
struct _mod_font {
Index: debug.h
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/debug.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** debug.h 15 Apr 2002 16:20:20 -0000 1.1.1.1
--- debug.h 3 Sep 2003 17:52:54 -0000 1.2
***************
*** 2,6 ****
#define __DEBUG_H_
! #include <glib.h>
/*
--- 2,10 ----
#define __DEBUG_H_
! #ifdef USE_GNOME2
! #include <glib-2.0/glib.h>
! #else
! #include <glib-1.2/glib.h>
! #endif
/*
Index: dictlex.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/dictlex.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** dictlex.c 1 Apr 2003 18:54:18 -0000 1.16
--- dictlex.c 3 Sep 2003 17:52:54 -0000 1.17
***************
*** 24,28 ****
--- 24,32 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
Index: gbs.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/gbs.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** gbs.c 1 Apr 2003 18:54:18 -0000 1.16
--- gbs.c 3 Sep 2003 17:52:54 -0000 1.17
***************
*** 28,32 ****
--- 28,36 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include "main/gbs.h"
Index: lists.h
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/lists.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** lists.h 13 May 2003 16:38:28 -0000 1.5
--- lists.h 3 Sep 2003 17:52:54 -0000 1.6
***************
*** 27,31 ****
--- 27,35 ----
{
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
/* list types */
Index: module.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/module.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** module.c 26 Jul 2003 20:46:29 -0000 1.9
--- module.c 3 Sep 2003 17:52:54 -0000 1.10
***************
*** 26,30 ****
--- 26,34 ----
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include <string.h>
***************
*** 187,190 ****
--- 191,198 ----
+ char *get_module_language(const char *module_name)
+ {
+ return backend_get_module_language(module_name);
+ }
/******************************************************************************
***************
*** 270,274 ****
*/
! int get_module_number(char *module_name, char *module_type)
{
return backend_get_module_page(module_name, module_type);
--- 278,282 ----
*/
! int get_module_number(const char *module_name, const char *module_type)
{
return backend_get_module_page(module_name, module_type);
Index: module.h
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/module.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** module.h 26 Jul 2003 20:46:29 -0000 1.6
--- module.h 3 Sep 2003 17:52:54 -0000 1.7
***************
*** 30,38 ****
int get_display_level(char * module_name);
int is_module_rtl(char * mod_name);
! int get_module_number(char *module_name, char *module_type);
int get_mod_type(char * mod_name);
int do_module_search(char * module_name ,const char *search_string,
int search_type, int search_params, int dialog);
char *get_module_description(char * module_name);
int module_is_locked(char * mod_name);
char *get_cipher_key(char *mod_name);
--- 30,39 ----
int get_display_level(char * module_name);
int is_module_rtl(char * mod_name);
! int get_module_number(const char *module_name, const char *module_type);
int get_mod_type(char * mod_name);
int do_module_search(char * module_name ,const char *search_string,
int search_type, int search_params, int dialog);
char *get_module_description(char * module_name);
+ char *get_module_language(const char *module_name);
int module_is_locked(char * mod_name);
char *get_cipher_key(char *mod_name);
Index: percomm.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/percomm.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** percomm.c 7 Apr 2003 15:39:45 -0000 1.23
--- percomm.c 3 Sep 2003 17:52:54 -0000 1.24
***************
*** 25,29 ****
--- 25,33 ----
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include "main/percomm.h"
#include "main/settings.h"
Index: search.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/search.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** search.c 15 Aug 2003 18:44:17 -0000 1.10
--- search.c 3 Sep 2003 17:52:54 -0000 1.11
***************
*** 24,28 ****
--- 24,32 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include "gui/main_window.h"
Index: search.h
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/search.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** search.h 29 Apr 2003 19:19:30 -0000 1.5
--- search.h 3 Sep 2003 17:52:55 -0000 1.6
***************
*** 27,31 ****
--- 27,35 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
typedef struct _sword_search SEARCH_SWORD;
Index: settings.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/settings.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** settings.c 14 Aug 2003 12:31:22 -0000 1.22
--- settings.c 3 Sep 2003 17:52:55 -0000 1.23
***************
*** 158,162 ****
sprintf(settings.fnconfigure, "%s/%s", settings.gSwordDir,
"settings.xml");
!
/* if gSwordDir does not exist create it */
if (access(settings.fnconfigure, F_OK) == -1) {
--- 158,175 ----
sprintf(settings.fnconfigure, "%s/%s", settings.gSwordDir,
"settings.xml");
! /*
! if(new_configs){
! // user ask for new configs
! g_print("\nCreate new configs: need to create settings!\n");
! xml_create_settings_file(settings.fnconfigure);
! backend_init_main_mgr();
! init_lists();
! retval = gui_first_run();
! shutdown_list();
! backend_delete_main_mgr();
! xml_save_settings_doc(settings.fnconfigure);
! xml_free_settings_doc();
! }
! */
/* if gSwordDir does not exist create it */
if (access(settings.fnconfigure, F_OK) == -1) {
***************
*** 171,175 ****
xml_save_settings_doc(settings.fnconfigure);
xml_free_settings_doc();
-
}
--- 184,187 ----
***************
*** 188,197 ****
}
-
if (old_dir)
g_free(old_dir);
return retval;
}
-
/******************************************************************************
--- 200,207 ----
Index: shortcutbar.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/shortcutbar.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** shortcutbar.c 15 Aug 2003 18:30:44 -0000 1.10
--- shortcutbar.c 3 Sep 2003 17:52:55 -0000 1.11
***************
*** 24,28 ****
--- 24,32 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include <stdio.h>
#include <string.h>
Index: shortcutbar.h
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/shortcutbar.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shortcutbar.h 15 Aug 2003 18:30:44 -0000 1.6
--- shortcutbar.h 3 Sep 2003 17:52:55 -0000 1.7
***************
*** 27,31 ****
--- 27,35 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
/*** function prototypes ***/
Index: spell_aspell.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/spell_aspell.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spell_aspell.c 25 Dec 2002 02:38:12 -0000 1.1
--- spell_aspell.c 3 Sep 2003 17:52:55 -0000 1.2
***************
*** 26,30 ****
--- 26,34 ----
#ifdef USE_ASPELL
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include <string.h>
Index: spell_ispell.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/spell_ispell.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spell_ispell.c 30 Jul 2002 16:11:56 -0000 1.1
--- spell_ispell.c 3 Sep 2003 17:52:55 -0000 1.2
***************
*** 26,30 ****
--- 26,34 ----
#ifdef USE_ISPELL
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include <string.h>
Index: spell_pspell.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/spell_pspell.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** spell_pspell.c 9 Aug 2002 00:52:58 -0000 1.2
--- spell_pspell.c 3 Sep 2003 17:52:55 -0000 1.3
***************
*** 26,30 ****
--- 26,34 ----
#ifdef USE_PSPELL
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include <pspell/pspell.h>
#include <string.h>
Index: sword.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/sword.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sword.c 28 Jun 2003 19:57:28 -0000 1.17
--- sword.c 3 Sep 2003 17:52:55 -0000 1.18
***************
*** 24,28 ****
--- 24,32 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include <ctype.h>
#include <time.h>
Index: xml.c
===================================================================
RCS file: /cvsroot/gnomesword/gnomesword1/src/main/xml.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** xml.c 14 Aug 2003 12:31:22 -0000 1.9
--- xml.c 3 Sep 2003 17:52:55 -0000 1.10
***************
*** 24,28 ****
--- 24,32 ----
#endif
+ #ifdef USE_GNOME2
+ #include <glib-2.0/glib.h>
+ #else
#include <glib-1.2/glib.h>
+ #endif
#include <libxml/parser.h>
|