better support for gettext

diff --git a/Makefile.am b/Makefile.am
index 3532967..c4f22a7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for Openbox
 
 # Makefile.am for Openbox
 

-SUBDIRS = intl po m4 data doc otk src scripts
+SUBDIRS = po data doc otk src scripts

 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 
 .PHONY: doc
 MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in
 
 .PHONY: doc

diff --git a/bootstrap b/bootstrap
index 6eca957..7d6619e 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,7 @@ sh() {
   /bin/sh -c "set -x; $*"
 }
 
   /bin/sh -c "set -x; $*"
 }
 

-sh gettextize --intl --copy --no-changelog --force
+sh autopoint # for GNU gettext

 sh libtoolize --copy --force --automake
 sh aclocal
 sh autoheader
 sh libtoolize --copy --force --automake
 sh aclocal
 sh autoheader

diff --git a/configure.ac b/configure.ac
index f52ba15..60bae0f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,8 @@ LIBTOOL="$LIBTOOL --silent"
 AC_PROG_INSTALL
 
 ALL_LINGUAS=""
 AC_PROG_INSTALL
 
 ALL_LINGUAS=""

-AM_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT([external])

 
 AC_LANG(C++)
        
 
 AC_LANG(C++)
        


@@ -22,7 +23,8 @@ AC_LANG(C++)
 AC_MSG_CHECKING([for GCC])
 if test "$GCC" = "yes"; then
   AC_MSG_RESULT([yes])
 AC_MSG_CHECKING([for GCC])
 if test "$GCC" = "yes"; then
   AC_MSG_RESULT([yes])

-  CXXFLAGS="$CXXFLAGS -Wall -W"# -pedantic"
+  CXXFLAGS="$CXXFLAGS -Wall -W"
+# -pedantic"

 else
   AC_MSG_RESULT([no, trying other compilers])
   AC_MSG_CHECKING(for MIPSpro)
 else
   AC_MSG_RESULT([no, trying other compilers])
   AC_MSG_CHECKING(for MIPSpro)


@@ -332,10 +334,7 @@ AC_ARG_ENABLE([xinerama],
   AC_MSG_RESULT([no])
 )
 
   AC_MSG_RESULT([no])
 )
 

-AC_CONFIG_FILES([Makefile
-               m4/Makefile 
-               po/Makefile.in
-               intl/Makefile
+AC_CONFIG_FILES([Makefile po/Makefile.in

                otk/Makefile
                src/Makefile
                scripts/Makefile
                otk/Makefile
                src/Makefile
                scripts/Makefile

diff --git a/otk/otk_wrap.cc b/otk/otk_wrap.cc
index 08451e9..a16eb87 100644 (file)
--- a/otk/otk_wrap.cc
+++ b/otk/otk_wrap.cc
@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).

- * Version 1.3.17u-20021222-0248
+ * Version 1.3.17u-20021226-0459

  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make


@@ -1001,6 +1001,42 @@ static PyObject *_wrap_OtkEventDispatcher_getFallbackHandler(PyObject *self, PyO
 }
 
 
 }
 
 

+static PyObject *_wrap_OtkEventDispatcher_setMasterHandler(PyObject *self, PyObject *args) {
+    PyObject *resultobj;
+    otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ;
+    otk::OtkEventHandler *arg2 = (otk::OtkEventHandler *) 0 ;
+    PyObject * obj0  = 0 ;
+    PyObject * obj1  = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"OO:OtkEventDispatcher_setMasterHandler",&obj0,&obj1)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_otk__OtkEventHandler,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    (arg1)->setMasterHandler(arg2);
+    
+    Py_INCREF(Py_None); resultobj = Py_None;
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+
+static PyObject *_wrap_OtkEventDispatcher_getMasterHandler(PyObject *self, PyObject *args) {
+    PyObject *resultobj;
+    otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ;
+    otk::OtkEventHandler *result;
+    PyObject * obj0  = 0 ;
+    
+    if(!PyArg_ParseTuple(args,(char *)"O:OtkEventDispatcher_getMasterHandler",&obj0)) goto fail;
+    if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_otk__OtkEventDispatcher,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+    result = (otk::OtkEventHandler *)((otk::OtkEventDispatcher const *)arg1)->getMasterHandler();
+    
+    resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_otk__OtkEventHandler, 0);
+    return resultobj;
+    fail:
+    return NULL;
+}
+
+

 static PyObject *_wrap_OtkEventDispatcher_findHandler(PyObject *self, PyObject *args) {
     PyObject *resultobj;
     otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ;
 static PyObject *_wrap_OtkEventDispatcher_findHandler(PyObject *self, PyObject *args) {
     PyObject *resultobj;
     otk::OtkEventDispatcher *arg1 = (otk::OtkEventDispatcher *) 0 ;


@@ -12706,6 +12742,8 @@ static PyMethodDef SwigMethods[] = {
         { (char *)"OtkEventDispatcher_dispatchEvents", _wrap_OtkEventDispatcher_dispatchEvents, METH_VARARGS },
         { (char *)"OtkEventDispatcher_setFallbackHandler", _wrap_OtkEventDispatcher_setFallbackHandler, METH_VARARGS },
         { (char *)"OtkEventDispatcher_getFallbackHandler", _wrap_OtkEventDispatcher_getFallbackHandler, METH_VARARGS },
         { (char *)"OtkEventDispatcher_dispatchEvents", _wrap_OtkEventDispatcher_dispatchEvents, METH_VARARGS },
         { (char *)"OtkEventDispatcher_setFallbackHandler", _wrap_OtkEventDispatcher_setFallbackHandler, METH_VARARGS },
         { (char *)"OtkEventDispatcher_getFallbackHandler", _wrap_OtkEventDispatcher_getFallbackHandler, METH_VARARGS },

+        { (char *)"OtkEventDispatcher_setMasterHandler", _wrap_OtkEventDispatcher_setMasterHandler, METH_VARARGS },
+        { (char *)"OtkEventDispatcher_getMasterHandler", _wrap_OtkEventDispatcher_getMasterHandler, METH_VARARGS },

         { (char *)"OtkEventDispatcher_findHandler", _wrap_OtkEventDispatcher_findHandler, METH_VARARGS },
         { (char *)"OtkEventDispatcher_swigregister", OtkEventDispatcher_swigregister, METH_VARARGS },
         { (char *)"OtkEventHandler_handle", _wrap_OtkEventHandler_handle, METH_VARARGS },
         { (char *)"OtkEventDispatcher_findHandler", _wrap_OtkEventDispatcher_findHandler, METH_VARARGS },
         { (char *)"OtkEventDispatcher_swigregister", OtkEventDispatcher_swigregister, METH_VARARGS },
         { (char *)"OtkEventHandler_handle", _wrap_OtkEventHandler_handle, METH_VARARGS },