[java-libglom] Fix the build with the latest libglom 1.21.

[Murray Cumming <murrayc src gnome org>]

commit aebfdd77b5f679d182c684ac5fe98bbfb78b8a71
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jan 10 23:20:01 2012 +0100

    Fix the build with the latest libglom 1.21.
    
    * src/glom.i: Add template lines for the pair and list of that pair
    now returned by Glom::Document::get_translatable_items().
    * Makefile.am: Mention the new files that will the be generated.

 ChangeLog   |    8 ++++++++
 Makefile.am |    1 +
 src/glom.i  |    3 ++-
 3 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index df20734..4c81f0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-01-10  Murray Cumming  <murrayc murrayc com>
 
+	Fix the build with the latest libglom 1.21.
+
+	* src/glom.i: Add template lines for the pair and list of that pair
+	now returned by Glom::Document::get_translatable_items().
+	* Makefile.am: Mention the new files that will the be generated.
+
+2012-01-10  Murray Cumming  <murrayc murrayc com>
+
 	.pom file: Adjust so we can upload to the sonatype.org resository.
 
 	* java-libglom.pom.in: Change the scm to something like the git scm 
diff --git a/Makefile.am b/Makefile.am
index 4f2692f..502ad75 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,6 +71,7 @@ generated_java_sources = src/main/java/org/glom/libglom/BakeryDocument.java \
                          src/main/java/org/glom/libglom/TableInfo.java \
                          src/main/java/org/glom/libglom/TableInfoList.java \
                          src/main/java/org/glom/libglom/TranslatableItem.java \
+                         src/main/java/org/glom/libglom/TranslatableItemPair.java \
                          src/main/java/org/glom/libglom/TranslatableItemList.java \
                          src/main/java/org/glom/libglom/TypeNameMap.java \
                          src/main/java/org/glom/libglom/Value.java \
diff --git a/src/glom.i b/src/glom.i
index be50048..893b714 100644
--- a/src/glom.i
+++ b/src/glom.i
@@ -443,7 +443,8 @@ sharedptr<const LayoutItem_Field> get_navigation_relationship_specific()
  * Wrap some other lists.
  */
 %template(StringList) std::list< Glib::ustring >;
-%template(TranslatableItemList) std::list< Glom::sharedptr<TranslatableItem> >;
+%template(TranslatableItemPair) std::pair< Glom::sharedptr<TranslatableItem>, Glib::ustring>;
+%template(TranslatableItemList) std::list<std::pair< Glom::sharedptr<TranslatableItem>, Glib::ustring> >;
 %template(TableInfoList) std::list< Glom::sharedptr<TableInfo> >;
 %template(ChoiceValueList) std::list< Glom::sharedptr<ChoiceValue> >;