gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-224-g648a418)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  648a418f99c337a185462525bbffa66b89786007 (commit)
      from  6a2b3ff8557ebd8c321cdbe6e23abe1ef1df1580 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 libgeda/include/libgeda/o_types.h |    3 ---
 libgeda/include/prototype_priv.h  |    1 -
 libgeda/scheme/geda.scm           |    5 +++++
 libgeda/src/g_register.c          |   15 ---------------
 libgeda/src/libgeda.c             |    1 -
 5 files changed, 5 insertions(+), 20 deletions(-)


=================
 Commit Messages
=================

commit 648a418f99c337a185462525bbffa66b89786007
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Clean up unneeded stuff now we have (geda os) module.
    
    Also a rather out-of-date comment.

:100644 100644 4cc5a7e... be3c729... M	libgeda/include/libgeda/o_types.h
:100644 100644 2d51f40... 63f411b... M	libgeda/include/prototype_priv.h
:100644 100644 5187dde... 4c6751f... M	libgeda/scheme/geda.scm
:100644 100644 cf0e749... 21a16d0... M	libgeda/src/g_register.c
:100644 100644 5bb3eb4... be41a13... M	libgeda/src/libgeda.c

=========
 Changes
=========

commit 648a418f99c337a185462525bbffa66b89786007
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    libgeda: Clean up unneeded stuff now we have (geda os) module.
    
    Also a rather out-of-date comment.

diff --git a/libgeda/include/libgeda/o_types.h b/libgeda/include/libgeda/o_types.h
index 4cc5a7e..be3c729 100644
--- a/libgeda/include/libgeda/o_types.h
+++ b/libgeda/include/libgeda/o_types.h
@@ -21,9 +21,6 @@
 #define _O_TYPES_H_INCL
 
 /* Object types */
-/* Object types are also available in scheme */
-/* If there is any addition, add them also in g_register.c 
-   (function g_register_libgeda_vars) */
 #define OBJ_LINE        'L'
 #define OBJ_PATH        'H'
 #define OBJ_BOX         'B'
diff --git a/libgeda/include/prototype_priv.h b/libgeda/include/prototype_priv.h
index 2d51f40..63f411b 100644
--- a/libgeda/include/prototype_priv.h
+++ b/libgeda/include/prototype_priv.h
@@ -35,7 +35,6 @@ SCM g_rc_print_color_map (SCM scm_map);
 
 /* g_register.c */
 void g_register_libgeda_funcs(void);
-void g_register_libgeda_vars (void);
 void g_register_libgeda_dirs (void);
 
 /* m_bounds.c */
diff --git a/libgeda/scheme/geda.scm b/libgeda/scheme/geda.scm
index 5187dde..4c6751f 100644
--- a/libgeda/scheme/geda.scm
+++ b/libgeda/scheme/geda.scm
@@ -1,4 +1,9 @@
 ; -*-Scheme-*-
+(use-modules (geda os))
+(define path-sep separator)
+(define geda-data-path (car (sys-data-dirs)))
+(define geda-rc-path (car (sys-config-dirs)))
+
 (define (build-path first . rest)
   (if (null? rest) first
       (apply build-path 
diff --git a/libgeda/src/g_register.c b/libgeda/src/g_register.c
index cf0e749..21a16d0 100644
--- a/libgeda/src/g_register.c
+++ b/libgeda/src/g_register.c
@@ -90,21 +90,6 @@ void g_register_libgeda_funcs (void)
   
 }
 
-
-/*! \brief Register some libgeda variables with scheme.
- *  \par Function Description
- *  Define some variables to be visible to Scheme.
- */
-void g_register_libgeda_vars (void)
-{
-  scm_c_define("geda-rc-path", 
-	       scm_from_utf8_string (s_path_sys_config ()));
-  scm_c_define("geda-data-path",
-	       scm_from_utf8_string (s_path_sys_data ()));
-  scm_c_define("path-sep", 
-	       scm_from_utf8_string(G_DIR_SEPARATOR_S));
-}
-
 /*! \brief Register some libgeda directories with Scheme.
  * \par Function Description
  * Ensures that the default gEDA Scheme directory is added to the
diff --git a/libgeda/src/libgeda.c b/libgeda/src/libgeda.c
index 5bb3eb4..be41a13 100644
--- a/libgeda/src/libgeda.c
+++ b/libgeda/src/libgeda.c
@@ -66,7 +66,6 @@ void libgeda_init(void)
   s_color_init();
 
   g_register_libgeda_funcs();
-  g_register_libgeda_vars();
   g_register_libgeda_dirs();
 
   edascm_init ();




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs