Update to 0.9.0:

This is the first 0.9 release - the main editing widget has been rewritten
since the last release (0.7.16). Please download it and try to break things
(and fix them - patches gratefully acepted!).

The new code fixes a long-standing problem where Conglomerate would crash when
loading certain documents. This has now been fixed (we believe), so that
Conglomerate should now be able to load and display any well-formed XML
document. The design is simpler and should enable us to implement more
sophisticated effects in the future (e.g. table editing).

Unfortunately, whilst it's better than it was at loading files, it's now less
stable when it comes to editing them. There are quite a few bugs still present
in the new implementation - for example, "span tags" are invisible if present
in a document loaded off disk (freshly created span tags appear as expected).
This and other bugs can be seen below a tracker bug ( bug # 143769 ); please
file bugs with editing and attach them to this tracker bug.

New Translations:
      * Simplified Chinese (zh_CN) (Funda Wang)

Updated Translations:
      * Czech (cs) (Miloslav Trmac)
      * German (de) (Frank Arnold)
      * Greek (el) (Kostas Papadimas)
      * Canadian English (en_CA) (Adam Weinberger)
      * British English (en_GB) (David Lodge)
      * Spanish (es) (Francisco Javier F. Serrador)
      * French (fr) (Michèle Garoche)
      * Dutch (nl) (Daniel van Eeden)

Enhancements
      * Major rewrite of the main editing widget (David Malcolm)
        (Nickolay V. Shmyrev)
      * Improvements to menu icons and keyboard shortcuts (Alan Horkan)
      * Beginnings of work on a table-editing plugin for DocBook
        (David Malcolm)

Fixes
      * Fixes to i18n framework (Michèle Garoche) (Geert Stappers)
        (Marcel Telka)
        Fixes to improve stability of basic editing (Nickolay V. Shmyrev)
      * Fixed the random document generator to use the correct text
        "Lorem ipsum" text from Cicero's "de Finibus Bonorum et Malorum",
	based on http://lipsum.com/ (David Malcolm)
      * Cleaned up to fix bug # 145096 (David Malcolm)
      * Fixed simple word-wrapping in new editor widget (I hope) bug # 143994
        (David Malcolm)

4 files changed, 203 insertions, 62 deletions

diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 2f6ca4f2894..784a938a10e 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2005/01/01 03:44:51 minskim Exp $
+# $NetBSD: Makefile,v 1.29 2005/02/14 21:32:10 jmmv Exp $
 #
 
-DISTNAME=	conglomerate-0.7.12
-PKGREVISION=	6
+DISTNAME=	conglomerate-0.9.0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conglomerate/}
 
@@ -24,7 +23,7 @@ USE_PKGLOCALEDIR=	yes
 
 CONFIGURE_ARGS+=	--enable-printing
 CONFIGURE_ARGS+=	--disable-gtk-doc
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 GCONF2_SCHEMAS=		conglomerate.schemas
 
@@ -37,10 +36,12 @@ GCONF2_SCHEMAS=		conglomerate.schemas
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
+.include "../../textproc/enchant/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtksourceview/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/editors/conglomerate/PLIST b/editors/conglomerate/PLIST
index 189c5773fe9..6258cf9f6a2 100644
--- a/editors/conglomerate/PLIST
+++ b/editors/conglomerate/PLIST
@@ -1,74 +1,171 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/17 23:25:45 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2005/02/14 21:32:10 jmmv Exp $
 bin/conglomerate
 share/application-registry/conglomerate.applications
 share/applications/conglomerate.desktop
+share/conglomerate/css/docbook.css
 share/conglomerate/dispspecs/cnxml.xds
-share/conglomerate/dispspecs/dispspec-template.xds
 share/conglomerate/dispspecs/dispspec.xds
 share/conglomerate/dispspecs/docbook.xds
 share/conglomerate/dispspecs/forrest-document.xds
 share/conglomerate/dispspecs/kernel-traffic-newsletter.xds
+share/conglomerate/dispspecs/opml.xds
 share/conglomerate/dispspecs/readme.xds
 share/conglomerate/dispspecs/relax-ng.xds
+share/conglomerate/dispspecs/release.xds
 share/conglomerate/dispspecs/teixlite.xds
 share/conglomerate/dispspecs/website-layout.xds
 share/conglomerate/dispspecs/website-webpage.xds
 share/conglomerate/dispspecs/xhtml1-strict.xds
 share/conglomerate/dispspecs/xsl.xds
+share/conglomerate/dtd/release.dtd
 share/conglomerate/dtd/xds.dtd
 share/conglomerate/examples/cnxml.xml
 share/conglomerate/examples/error-proposal.xml
 share/conglomerate/examples/file-roller.xml
 share/conglomerate/examples/i18n.xml
+share/conglomerate/examples/nmtoken.xml
 share/conglomerate/examples/readme.xml
 share/conglomerate/examples/test-docbook.xml
 share/conglomerate/examples/test-entities.xml
 share/conglomerate/examples/test-table.xml
+share/conglomerate/examples/test-table3.xml
 share/conglomerate/glade/cong-file-import.glade
 share/conglomerate/glade/cong-file-properties.glade
 share/conglomerate/glade/cong-find-replace.glade
+share/conglomerate/glade/cong-preferences.glade
+share/conglomerate/glade/custom-element.glade
 share/conglomerate/glade/docbook-common-properties.glade
 share/conglomerate/glade/docbook-orderedlist-properties.glade
 share/conglomerate/glade/docbook-ulink-properties.glade
+share/conglomerate/glade/plugin-arbitrary.glade
 share/conglomerate/glade/plugin-random.glade
 share/conglomerate/glade/string_selection_dialog.glade
-share/conglomerate/pixmaps/cong-address-16.png
-share/conglomerate/pixmaps/cong-answer-16.png
-share/conglomerate/pixmaps/cong-author-16.png
-share/conglomerate/pixmaps/cong-bibliography-16.png
-share/conglomerate/pixmaps/cong-bulleted-list-16.png
-share/conglomerate/pixmaps/cong-caution-48.png
-share/conglomerate/pixmaps/cong-code-fragment-16.png
-share/conglomerate/pixmaps/cong-definition-list-16.png
-share/conglomerate/pixmaps/cong-docbook-article-16.png
-share/conglomerate/pixmaps/cong-docbook-book-16.png
-share/conglomerate/pixmaps/cong-docbook-set-16.png
-share/conglomerate/pixmaps/cong-editor-16.png
-share/conglomerate/pixmaps/cong-entry-16.png
-share/conglomerate/pixmaps/cong-faq-16.png
-share/conglomerate/pixmaps/cong-footnote-16.png
-share/conglomerate/pixmaps/cong-history-16.png
-share/conglomerate/pixmaps/cong-important-48.png
-share/conglomerate/pixmaps/cong-indexterm-16.png
-share/conglomerate/pixmaps/cong-list-16.png
-share/conglomerate/pixmaps/cong-list-item-16.png
-share/conglomerate/pixmaps/cong-metadata-16.png
-share/conglomerate/pixmaps/cong-name-16.png
-share/conglomerate/pixmaps/cong-note-48.png
-share/conglomerate/pixmaps/cong-numbered-list-16.png
-share/conglomerate/pixmaps/cong-paragraph-16.png
-share/conglomerate/pixmaps/cong-publisher-16.png
-share/conglomerate/pixmaps/cong-question-16.png
-share/conglomerate/pixmaps/cong-subsection-16.png
-share/conglomerate/pixmaps/cong-summary-16.png
-share/conglomerate/pixmaps/cong-tip-48.png
-share/conglomerate/pixmaps/cong-title-16.png
-share/conglomerate/pixmaps/cong-warning-48.png
-share/conglomerate/pixmaps/cong-wrapper-16.png
-share/conglomerate/pixmaps/conglomerate-icon-32.png
 share/conglomerate/stylesheets/selection-to-text.xsl
+share/conglomerate/templates/dispspec-template.xds
 share/conglomerate/templates/dispspec.xml
 share/conglomerate/templates/html.xml
+share/doc/conglomerate/CongAttributeEditor.html
+share/doc/conglomerate/CongAttributeEditorCDATA.html
+share/doc/conglomerate/CongAttributeEditorENUMERATION.html
+share/doc/conglomerate/CongAttributeEditorLang.html
+share/doc/conglomerate/CongAttributeWrapper.html
+share/doc/conglomerate/CongAttributeWrapperCheckButton.html
+share/doc/conglomerate/CongAttributeWrapperRadioButton.html
+share/doc/conglomerate/CongCommand.html
+share/doc/conglomerate/CongCommandHistory.html
+share/doc/conglomerate/CongDocument.html
+share/doc/conglomerate/CongDocumentTraversal.html
+share/doc/conglomerate/CongEditorArea.html
+share/doc/conglomerate/CongEditorAreaBin.html
+share/doc/conglomerate/CongEditorAreaBorder.html
+share/doc/conglomerate/CongEditorAreaComposer.html
+share/doc/conglomerate/CongEditorAreaContainer.html
+share/doc/conglomerate/CongEditorAreaEntityDecl.html
+share/doc/conglomerate/CongEditorAreaEntityRef.html
+share/doc/conglomerate/CongEditorAreaExpander.html
+share/doc/conglomerate/CongEditorAreaLabelled.html
+share/doc/conglomerate/CongEditorAreaLine.html
+share/doc/conglomerate/CongEditorAreaListitem.html
+share/doc/conglomerate/CongEditorAreaParagraph.html
+share/doc/conglomerate/CongEditorAreaPixbuf.html
+share/doc/conglomerate/CongEditorAreaSpacer.html
+share/doc/conglomerate/CongEditorAreaSpanTag.html
+share/doc/conglomerate/CongEditorAreaStructural.html
+share/doc/conglomerate/CongEditorAreaStructuralTag.html
+share/doc/conglomerate/CongEditorAreaText.html
+share/doc/conglomerate/CongEditorAreaTextComment.html
+share/doc/conglomerate/CongEditorAreaTextFragment.html
+share/doc/conglomerate/CongEditorAreaUnderline.html
+share/doc/conglomerate/CongEditorAreaUnknownTag.html
+share/doc/conglomerate/CongEditorNode.html
+share/doc/conglomerate/CongEditorNodeElement.html
+share/doc/conglomerate/CongEditorNodeElementListitem.html
+share/doc/conglomerate/CongEditorNodeElementParagraph.html
+share/doc/conglomerate/CongEditorWidget3.html
+share/doc/conglomerate/CongModification.html
+share/doc/conglomerate/CongModificationCursorChange.html
+share/doc/conglomerate/CongModificationSelectionChange.html
+share/doc/conglomerate/CongModificationSetDtdPtr.html
+share/doc/conglomerate/CongNodeModification.html
+share/doc/conglomerate/CongNodeModificationAddAfter.html
+share/doc/conglomerate/CongNodeModificationAddBefore.html
+share/doc/conglomerate/CongNodeModificationMakeOrphan.html
+share/doc/conglomerate/CongNodeModificationRemoveAttribute.html
+share/doc/conglomerate/CongNodeModificationSetAttribute.html
+share/doc/conglomerate/CongNodeModificationSetParent.html
+share/doc/conglomerate/CongNodeModificationSetText.html
+share/doc/conglomerate/CongPlugin.html
+share/doc/conglomerate/CongService.html
+share/doc/conglomerate/CongServiceDocTool.html
+share/doc/conglomerate/CongServiceDocumentFactory.html
+share/doc/conglomerate/CongServiceEditorNodeFactory.html
+share/doc/conglomerate/CongServiceExporter.html
+share/doc/conglomerate/CongServiceImporter.html
+share/doc/conglomerate/CongServiceNodePropertyDialog.html
+share/doc/conglomerate/CongServiceNodeTool.html
+share/doc/conglomerate/CongServiceTool.html
+share/doc/conglomerate/CongTraversalNode.html
+share/doc/conglomerate/CongXPathExpression.html
+share/doc/conglomerate/ch01.html
+share/doc/conglomerate/ch02.html
+share/doc/conglomerate/class-hierarchy.html
+share/doc/conglomerate/class-overview.html
+share/doc/conglomerate/conglomerate-CongApp.html
+share/doc/conglomerate/conglomerate-CongDispspec.html
+share/doc/conglomerate/conglomerate-CongDispspecElement.html
+share/doc/conglomerate/conglomerate-CongDispspecRegistry.html
+share/doc/conglomerate/conglomerate-CongEditorNodeComment.html
+share/doc/conglomerate/conglomerate-CongEditorNodeDocument.html
+share/doc/conglomerate/conglomerate-CongEditorNodeDtd.html
+share/doc/conglomerate/conglomerate-CongEditorNodeElementAdmonition.html
+share/doc/conglomerate/conglomerate-CongEditorNodeElementSpan.html
+share/doc/conglomerate/conglomerate-CongEditorNodeElementStructural.html
+share/doc/conglomerate/conglomerate-CongEditorNodeElementUnknown.html
+share/doc/conglomerate/conglomerate-CongEditorNodeEntityDecl.html
+share/doc/conglomerate/conglomerate-CongEditorNodeEntityRef.html
+share/doc/conglomerate/conglomerate-CongEditorNodeText.html
+share/doc/conglomerate/conglomerate-CongEditorNodeUnimplemented.html
+share/doc/conglomerate/conglomerate-CongLocation.html
+share/doc/conglomerate/conglomerate-CongObject.html
+share/doc/conglomerate/conglomerate-CongPluginManager.html
+share/doc/conglomerate/conglomerate-CongRange.html
+share/doc/conglomerate/conglomerate-CongSelection.html
+share/doc/conglomerate/conglomerate-CongServicePrintMethod.html
+share/doc/conglomerate/conglomerate-DTD-Handling.html
+share/doc/conglomerate/conglomerate-Utility-functions.html
+share/doc/conglomerate/conglomerate-XML-Nodes.html
+share/doc/conglomerate/conglomerate-cong-dialog.html
+share/doc/conglomerate/conglomerate-cong-edit-find-and-replace.html
+share/doc/conglomerate/conglomerate-cong-eel-graphic-effects.html
+share/doc/conglomerate/conglomerate-cong-eel.html
+share/doc/conglomerate/conglomerate-cong-enum-mapping.html
+share/doc/conglomerate/conglomerate-cong-error-dialog.html
+share/doc/conglomerate/conglomerate-cong-fake-plugin-hooks.html
+share/doc/conglomerate/conglomerate-cong-file-selection.html
+share/doc/conglomerate/conglomerate-cong-font.html
+share/doc/conglomerate/conglomerate-cong-glade.html
+share/doc/conglomerate/conglomerate-cong-graph.html
+share/doc/conglomerate/conglomerate-cong-marshal.html
+share/doc/conglomerate/conglomerate-cong-overview-view.html
+share/doc/conglomerate/conglomerate-cong-parser-error.html
+share/doc/conglomerate/conglomerate-cong-primary-window.html
+share/doc/conglomerate/conglomerate-cong-progress-checklist.html
+share/doc/conglomerate/conglomerate-cong-text-cache.html
+share/doc/conglomerate/conglomerate-cong-tree-view.html
+share/doc/conglomerate/conglomerate-cong-ui-hooks.html
+share/doc/conglomerate/conglomerate-cong-vfs.html
+share/doc/conglomerate/conglomerate-cong-view.html
+share/doc/conglomerate/conglomerate-global.html
+share/doc/conglomerate/editor.html
+share/doc/conglomerate/helper.html
+share/doc/conglomerate/index.html
+share/doc/conglomerate/index.sgml
+share/doc/conglomerate/ix01.html
+share/doc/conglomerate/misc.html
+share/doc/conglomerate/plugins.html
+share/doc/conglomerate/state.html
+share/doc/conglomerate/views.html
+share/doc/conglomerate/xml.html
 share/gconf/schemas/conglomerate.schemas
 share/gnome/help/conglomerate/C/cong_element_map_ref.xml
 share/gnome/help/conglomerate/C/conglomerate.xml
@@ -135,38 +232,83 @@ ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/conglomerate.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/conglomerate.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/conglomerate.mo
 share/mime-info/conglomerate.keys
 share/mime-info/conglomerate.mime
 share/omf/conglomerate/conglomerate-C.omf
 share/pixmaps/conglomerate-icon-16.png
+share/pixmaps/conglomerate/cong-address-16.png
+share/pixmaps/conglomerate/cong-answer-16.png
+share/pixmaps/conglomerate/cong-author-16.png
+share/pixmaps/conglomerate/cong-bibliography-16.png
+share/pixmaps/conglomerate/cong-bulleted-list-16.png
+share/pixmaps/conglomerate/cong-caution-48.png
+share/pixmaps/conglomerate/cong-code-fragment-16.png
+share/pixmaps/conglomerate/cong-comment-16.png
+share/pixmaps/conglomerate/cong-definition-list-16.png
+share/pixmaps/conglomerate/cong-docbook-article-16.png
+share/pixmaps/conglomerate/cong-docbook-book-16.png
+share/pixmaps/conglomerate/cong-docbook-set-16.png
+share/pixmaps/conglomerate/cong-editor-16.png
+share/pixmaps/conglomerate/cong-entry-16.png
+share/pixmaps/conglomerate/cong-faq-16.png
+share/pixmaps/conglomerate/cong-footnote-16.png
+share/pixmaps/conglomerate/cong-history-16.png
+share/pixmaps/conglomerate/cong-important-48.png
+share/pixmaps/conglomerate/cong-indexterm-16.png
+share/pixmaps/conglomerate/cong-list-16.png
+share/pixmaps/conglomerate/cong-list-item-16.png
+share/pixmaps/conglomerate/cong-metadata-16.png
+share/pixmaps/conglomerate/cong-name-16.png
+share/pixmaps/conglomerate/cong-note-48.png
+share/pixmaps/conglomerate/cong-numbered-list-16.png
+share/pixmaps/conglomerate/cong-paragraph-16.png
+share/pixmaps/conglomerate/cong-publisher-16.png
+share/pixmaps/conglomerate/cong-question-16.png
+share/pixmaps/conglomerate/cong-subsection-16.png
+share/pixmaps/conglomerate/cong-summary-16.png
+share/pixmaps/conglomerate/cong-tip-48.png
+share/pixmaps/conglomerate/cong-title-16.png
+share/pixmaps/conglomerate/cong-uncomment-16.png
+share/pixmaps/conglomerate/cong-warning-48.png
+share/pixmaps/conglomerate/cong-wrapper-16.png
+share/pixmaps/conglomerate/conglomerate-icon-32.png
+share/pixmaps/conglomerate/conglomerate-logo.png
+@dirrm share/pixmaps/conglomerate
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/conglomerate
 @comment in scrollkeeper: @dirrm share/omf
-@comment in gnome2-dirs: @dirrm share/mime-info
+@comment in xdg-dirs: @dirrm share/mime-info
 @dirrm share/gnome/help/conglomerate/C/figures
 @dirrm share/gnome/help/conglomerate/C
 @dirrm share/gnome/help/conglomerate
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/doc/conglomerate
 @dirrm share/conglomerate/templates
 @dirrm share/conglomerate/stylesheets
-@dirrm share/conglomerate/pixmaps
 @dirrm share/conglomerate/glade
 @dirrm share/conglomerate/examples
 @dirrm share/conglomerate/dtd
 @dirrm share/conglomerate/dispspecs
+@dirrm share/conglomerate/css
 @dirrm share/conglomerate
-@comment in gnome2-dirs: @dirrm share/applications
-@comment in gnome2-dirs: @dirrm share/application-registry
+@comment in xdg-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/application-registry
diff --git a/editors/conglomerate/distinfo b/editors/conglomerate/distinfo
index 35fc44bfa1c..46378c0b5ed 100644
--- a/editors/conglomerate/distinfo
+++ b/editors/conglomerate/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2004/03/09 22:05:08 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2005/02/14 21:32:10 jmmv Exp $
 
-SHA1 (conglomerate-0.7.12.tar.gz) = 878c53f8eb837a1548f5cd3ec4cc41980b9d3e58
-Size (conglomerate-0.7.12.tar.gz) = 1996197 bytes
-SHA1 (patch-aa) = 6bcfa30f58bd6a1e82ba7faa897face18fb01839
+SHA1 (conglomerate-0.9.0.tar.gz) = eb19cf6cf0823920f746abc1deae582b4eeeaa88
+Size (conglomerate-0.9.0.tar.gz) = 2750760 bytes
+SHA1 (patch-aa) = 49275d1a9f81638e8eb945ff7c9732fc01bf0a08
diff --git a/editors/conglomerate/patches/patch-aa b/editors/conglomerate/patches/patch-aa
index aba80833b31..77146edab05 100644
--- a/editors/conglomerate/patches/patch-aa
+++ b/editors/conglomerate/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2004/03/09 22:05:08 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2005/02/14 21:32:10 jmmv Exp $
 
---- src/cong-editor-node-element-span.c.orig	2004-02-17 18:24:28.000000000 +0100
-+++ src/cong-editor-node-element-span.c
-@@ -145,9 +145,8 @@ generate_line_areas_recursive (CongEdito
- 				
- 				if (child_line_fragments) {
- 					GList* list_of_areas;
--					list_of_areas = cong_editor_line_fragments_get_area_list (child_line_fragments);
--					
- 					gboolean is_first = TRUE;
-+					list_of_areas = cong_editor_line_fragments_get_area_list (child_line_fragments);
- 					
- 					while (list_of_areas) {
- 						
+--- data/Makefile.in.orig	2005-02-14 18:04:43.000000000 +0100
++++ data/Makefile.in
+@@ -153,7 +153,7 @@ appdir = $(datadir)/application-registry
+ mimedir = $(datadir)/mime-info
+ mime_DATA = conglomerate.mime
+ 
+-schemadir = $(sysconfdir)/gconf/schemas/
++schemadir = $(GCONF_SCHEMA_FILE_DIR)
+ schema_in_files = conglomerate.schemas.in
+ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+