[gtksourceview] Bug 614373 - Made Glade catalog translatable

[Garrett Regier <gregier src gnome org>]

commit 9dec73eacce50f036c65d7dfec9ffd48e978ec32
Author: Garrett Regier <alias301 gmail com>
Date:   Tue May 18 03:51:24 2010 -0700

    Bug 614373 - Made Glade catalog translatable

 configure.ac                       |    6 ++--
 data/glade/Makefile.am             |   15 +++++++++++-
 data/glade/gtksourceview-glade.xml |   43 ------------------------------------
 data/glade/gtksourceview.xml.in    |   42 +++++++++++++++++++++++++++++++++++
 po/POTFILES.in                     |   11 +++++----
 5 files changed, 64 insertions(+), 53 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3f52574..6f92309 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,9 +101,9 @@ AM_CONDITIONAL([GLADE_CATALOG], [ test "$glade_catalog" = "yes" ])
 AS_IF([ test "$glade_catalog" = "yes" ],
 	[PKG_CHECK_EXISTS(GLADE, [gladeui-1.0 >= $GLADE_UI_REQUIRED])
 	 AC_MSG_CHECKING([for Glade catalog dir])
-	 GLADE_CATALOGDIR=`$PKG_CONFIG --variable=catalogdir gladeui-1.0 2>&AS_MESSAGE_LOG_FD`
-         AC_MSG_RESULT([$GLADE_CATALOGDIR])
-	 AC_SUBST(GLADE_CATALOGDIR)])
+	 GLADE_CATALOG_DIR=`$PKG_CONFIG --variable=catalogdir gladeui-1.0 2>&AS_MESSAGE_LOG_FD`
+         AC_MSG_RESULT([$GLADE_CATALOG_DIR])
+	 AC_SUBST(GLADE_CATALOG_DIR)])
 
 # i18N stuff
 IT_PROG_INTLTOOL([0.40])
diff --git a/data/glade/Makefile.am b/data/glade/Makefile.am
index cc48784..f2a434f 100644
--- a/data/glade/Makefile.am
+++ b/data/glade/Makefile.am
@@ -1,4 +1,15 @@
-catalogdir = $(GLADE_CATALOGDIR)
-dist_catalog_DATA = gtksourceview-glade.xml
+cataloguedir = $(GLADE_CATALOGUE_DIR)
+catalogue_in_files = gtksourceview.xml.in
+catalogue_DATA = $(catalogue_in_files:.xml.in=.xml)
+
+EXTRA_DIST = \
+	$(catalogue_DATA)
+
+validate: $(catalogue_DATA)
+	xmllint --dtdvalid $(GLADE_CATALOGUE_DIR)/glade-catalog.dtd --noout $<
+
+MAINTAINERCLEANFILES = $(catalogue_DATA)
+
+ INTLTOOL_XML_NOMERGE_RULE@
 
 -include $(top_srcdir)/git.mk
diff --git a/data/glade/gtksourceview.xml.in b/data/glade/gtksourceview.xml.in
new file mode 100644
index 0000000..574fc98
--- /dev/null
+++ b/data/glade/gtksourceview.xml.in
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glade-catalog version="2.10" supports="gtkbuilder" name="gtksourceview" library="gtksourceview" domain="gtksourceview" depends="gtk+" book="gtksourceview">
+  <glade-widget-classes>
+    <glade-widget-class name="GtkSourceView" _title="GtkSourceView" generic-name="gtksourceview">
+      <properties>
+        <property id="auto-indent" common="True" default="True" />
+        <property id="highlight-current-line" common="False" default="False" />
+        <property id="indent-on-tab" common="False" default="False" />
+        <property id="insert-spaces-instead-of-tabs" common="False" default="False" />
+        <property id="right-margin-position" common="False" default="80" />
+        <property id="show-line-marks" common="False" default="False" />
+        <property id="show-line-numbers" common="False" default="False" />
+        <property id="show-right-margin" common="False" default="False" />
+        <property id="smart-home-end" common="True" default="Disabled">
+          <displayable-values>
+            <value id="GTK_SOURCE_SMART_HOME_END_DISABLED" _name="Disabled" />
+            <value id="GTK_SOURCE_SMART_HOME_END_BEFORE" _name="Before" />
+            <value id="GTK_SOURCE_SMART_HOME_END_AFTER" _name="After" />
+            <value id="GTK_SOURCE_SMART_HOME_END_ALWAYS" _name="Always" />
+          </displayable-values>
+        </property>
+        <property id="tab-width" common="False" default="4" />
+        <property id="draw-spaces">
+          <displayable-values>
+            <value id="GTK_SOURCE_DRAW_SPACES_SPACE" _name="Space" />
+            <value id="GTK_SOURCE_DRAW_SPACES_TAB" _name="Tab" />
+            <value id="GTK_SOURCE_DRAW_SPACES_NEWLINE" _name="Newline" />
+            <value id="GTK_SOURCE_DRAW_SPACES_NBSP" _name="Non Breaking Whitespace" />
+            <value id="GTK_SOURCE_DRAW_SPACES_LEADING" _name="Leading" />
+            <value id="GTK_SOURCE_DRAW_SPACES_TEXT" _name="Text" />
+            <value id="GTK_SOURCE_DRAW_SPACES_TRAILING" _name="Trailing" />
+            <value id="GTK_SOURCE_DRAW_SPACES_ALL" _name="All" />
+          </displayable-values>
+        </property>
+      </properties>
+    </glade-widget-class>
+  </glade-widget-classes>
+
+  <glade-widget-group name="GtkSourceView" _title="GtkSourceView">
+    <glade-widget-class-ref name="GtkSourceView" />
+  </glade-widget-group>
+</glade-catalog>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 806c861..216cce4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,4 @@
-data/styles/classic.xml
-data/styles/cobalt.xml
-data/styles/kate.xml
-data/styles/oblivion.xml
-data/styles/tango.xml
+data/glade/gtksourceview.xml.in
 data/language-specs/ada.lang
 data/language-specs/asp.lang
 data/language-specs/awk.lang
@@ -83,6 +79,11 @@ data/language-specs/vhdl.lang
 data/language-specs/xml.lang
 data/language-specs/xslt.lang
 data/language-specs/yacc.lang
+data/styles/classic.xml
+data/styles/cobalt.xml
+data/styles/kate.xml
+data/styles/oblivion.xml
+data/styles/tango.xml
 gtksourceview/completion-providers/words/gtksourcecompletionwords.c
 gtksourceview/gtksourcebuffer.c
 gtksourceview/gtksourcecompletion.c