SF.net SVN: geany:[3336] trunk

[eht16 at users.sourceforge.net]

Revision: 3336
          http://geany.svn.sourceforge.net/geany/?rev=3336&view=rev
Author:   eht16
Date:     2008-12-06 18:58:03 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
Add 'ui_toolbar.xml' to EXTRA_DIST, include it in the Windows installer and install it also when using Waf.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/geany.nsi
    trunk/wscript

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-12-06 18:04:46 UTC (rev 3335)
+++ trunk/ChangeLog	2008-12-06 18:58:03 UTC (rev 3336)
@@ -40,6 +40,9 @@
  * src/prefs.c, src/treeviews.c, src/msgwindow.c:
    Make use of ui_widget_modify_font_from_string() at various places.
    Set the message window font also for the scribble.
+ * Makefile.am, wscript, geany.nsi:
+   Add 'ui_toolbar.xml' to EXTRA_DIST, include it in the Windows
+   installer and install it also when using Waf.
 
 
 2008-12-05  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2008-12-06 18:04:46 UTC (rev 3335)
+++ trunk/Makefile.am	2008-12-06 18:58:03 UTC (rev 3336)
@@ -21,7 +21,8 @@
 	data/html_entities.tags \
 	$(srcdir)/data/filetypes.* \
 	data/filetype_extensions.conf \
-	data/snippets.conf
+	data/snippets.conf \
+	data/ui_toolbar.xml
 
 EXTRA_DIST = \
 	autogen.sh \

Modified: trunk/geany.nsi
===================================================================
--- trunk/geany.nsi	2008-12-06 18:04:46 UTC (rev 3335)
+++ trunk/geany.nsi	2008-12-06 18:58:03 UTC (rev 3336)
@@ -147,6 +147,7 @@
   File "${RESOURCEDIR}\data\GPL-2"
   File "${RESOURCEDIR}\data\file*"
   File "${RESOURCEDIR}\data\snippets.conf"
+  File "${RESOURCEDIR}\data\ui_toolbar.xml"
 
   SetOutPath "$INSTDIR\share\icons"
   File /r "${RESOURCEDIR}\share\icons\*"

Modified: trunk/wscript
===================================================================
--- trunk/wscript	2008-12-06 18:04:46 UTC (rev 3335)
+++ trunk/wscript	2008-12-06 18:58:03 UTC (rev 3336)
@@ -392,6 +392,7 @@
 	bld.install_files('${DATADIR}/geany', 'data/filetype*')
 	bld.install_files('${DATADIR}/geany', 'data/*.tags')
 	bld.install_files('${DATADIR}/geany', 'data/snippets.conf')
+	bld.install_files('${DATADIR}/geany', 'data/ui_toolbar.xml')
 	bld.install_as('${DATADIR}/geany/GPL-2', 'COPYING')
 	# Icons
 	bld.install_files('${DATADIR}/pixmaps', 'pixmaps/geany.png')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.