9 files changed, 140 insertions, 155 deletions

diff --git a/src/.cvsignore b/src/.cvsignore
index cff4dcc..822742d 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -10,6 +10,3 @@ guile-procedures.txt
 gsql_conn.inc
 gsql_lib.inc
 sql.scm
-gettext.inc
-gettext.scm
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 8b44d37..c5d713b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 # This file is part of guile-sql.
-# Copyright (C) 2002, Sergey Poznyakoff
+# Copyright (C) 2002, 2007, Sergey Poznyakoff
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -12,9 +12,8 @@
 INCLUDES =-I$(top_builddir) -I$(srcdir) -I. @GUILE_INCLUDES@ @INCLUDEPATH@
 
 LIB_SQL=libguile-sql.la
-LIB_GETTEXT=libguile-gettext.la
 
-EXTRA_LTLIBRARIES=libguile-sql.la libguile-gettext.la
+EXTRA_LTLIBRARIES=libguile-sql.la
 
 lib_LTLIBRARIES=@BUILD_LIBS@
 libguile_sql_la_LIBADD = @LTLIBOBJS@ @GUILE_LIBS@
@@ -24,30 +23,22 @@ libguile_sql_la_SOURCES=\
 
 libguile_sql_la_LDFLAGS = -rpath $(libdir) -version-info 0:0:0
 
-libguile_gettext_la_LIBADD = @GUILE_LIBS@ @LTLIBINTL@
-libguile_gettext_la_SOURCES = gettext.c
-
-libguile_gettext_la_LDFLAGS = -rpath $(libdir) -version-info 0:0:0
-
-
-noinst_HEADERS=guile-sql.h app.h gettext.h
-EXTRA_DIST=sql.sci gettext.sci
+noinst_HEADERS=guile-sql.h app.h
+EXTRA_DIST=sql.sci gettext.scm
 
 .sci.scm:
         m4 -DVERSION=$(VERSION) -DLIBDIR=$(libdir) \
            -DBUILDDIR="`pwd`" $< > $@
 
 sql.scm: Makefile $(libguile_sql_la_SOURCES:.c=.inc)
-gettext.scm: Makefile $(libguile_gettext_la_SOURCES:.c=.inc)
 
 SCM_SQL=sql.scm
 X_SQL=gsql_conn.x
 
 SCM_GETTEXT=gettext.scm
-X_GETTEXT=gettext.x
 
 guiledir=$(GUILE_SITE)/$(PACKAGE)
-guile_DATA=guile-procedures.txt @BUILD_DATA@
+guile_DATA=guile-procedures.txt @BUILD_DATA@ 
 DOT_X_FILES=@BUILD_X@
 DOT_DOC_FILES=$(DOT_X_FILES:.x=.doc)
 CLEANFILES=*.inc *.x *.doc
diff --git a/src/app.h b/src/app.h
index 56100c5..6b205ee 100644
--- a/src/app.h
+++ b/src/app.h
@@ -1,19 +1,18 @@
 /* This file is part of guile-sql.
    Copyright (C) 2002 Sergey Poznyakoff
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 3 of the License, or (at your
+   option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+   You should have received a copy of the GNU General Public License along
+   with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef USE_SQL_MYSQL
 extern struct sql_iface mysql_iface;
diff --git a/src/gettext.scm b/src/gettext.scm
new file mode 100644
index 0000000..a60bd59
--- /dev/null
+++ b/src/gettext.scm
@@ -0,0 +1,29 @@
+;;;; This file is part of gettext interface for guile.
+;;;; Copyright (C) 2004, 2007 Sergey Poznyakoff
+;;;; 
+;;;; This program is free software; you can redistribute it and/or modify it
+;;;; under the terms of the GNU General Public License as published by the
+;;;; Free Software Foundation; either version 3 of the License, or (at your
+;;;; option) any later version.
+;;;; 
+;;;; This program is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;; 
+;;;; You should have received a copy of the GNU General Public License along
+;;;; with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+(define-module (gamma gettext))
+
+(define (_ msgid)
+  (gettext msgid))
+
+(define (N_ msgid)
+  msgid)
+
+(export _)
+(export N_)
+
+;;;; EOF
diff --git a/src/gsql_conn.c b/src/gsql_conn.c
index 3a44c18..4a78094 100644
--- a/src/gsql_conn.c
+++ b/src/gsql_conn.c
@@ -1,19 +1,18 @@
 /* This file is part of guile-sql.
    Copyright (C) 2002, 2005 Sergey Poznyakoff
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the
+   Free Software Foundation; either version 3 of the License, or (at your
+   option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
+   You should have received a copy of the GNU General Public License along
+   with this program. If not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
@@ -21,14 +20,14 @@
 #include <string.h>
 #include <guile-sql.h>
 #include <app.h>
+#include <stdio.h>
 
 static int num_iface;
-struct sql_iface sql_iftab[MAX_IFACES];
+static struct sql_iface sql_iftab[MAX_IFACES];
 
 SCM_GLOBAL_SYMBOL (gsql_error, "gsql-error");
 
-
-long sql_connect_tag;
+static long sql_connect_tag = -1;
 
 /* SMOB functions: */
 static SCM
@@ -50,7 +49,7 @@ sql_connect_free (SCM connect_smob)
                 free(conn->username);
         if (conn->database)
                 free(conn->database);
-        free(conn);
+        scm_gc_free(conn, sizeof *conn, "SQL connection");
         return size;
 }
 
@@ -76,8 +75,8 @@ sql_connect_print (SCM connect_smob, SCM port, scm_print_state * pstate)
         return 1;
 }
 
-int
-sql_find_iface(char *name)
+static int
+sql_find_iface(const char *name)
 {       
         int iface;
         
@@ -95,15 +94,15 @@ sql_connect_create (char *name)
         if (iface < 0) 
                 scm_misc_error("sql_connect_create",
                                "Unknown SQL interface ~S",
-                               SCM_LIST1(scm_makfrom0str(name)));
+                               scm_list_1(scm_makfrom0str(name)));
         
-        conn = scm_must_malloc (sizeof (*conn), "sql_connect");
+        conn = scm_gc_malloc (sizeof (*conn), "sql_connect");
         memset(conn, 0, sizeof *conn);
         conn->iface = iface;
         SCM_RETURN_NEWSMOB (sql_connect_tag, conn);
 }