From 06c11cc4c6473dcab0415a2e9f17c7a8dacb5894 Mon Sep 17 00:00:00 2001
From: Pierre-Luc Beaudoin <pierre-luc@squidy.info>
Date: Sat, 6 Sep 2008 13:32:24 -0400
Subject: [PATCH] Fix image installation

---
 champlain/Makefile.am |   9 +-
 champlain/marker.svg  | 271 ------------------------------------------
 champlain/tile.c      |   2 +-
 3 files changed, 7 insertions(+), 275 deletions(-)
 delete mode 100644 champlain/marker.svg

diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index c202638..b2d251a 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -27,8 +27,6 @@ libchamplain_1_0_la_SOURCES = $(CHAMPLAIN_MARSHAL_LIST) \
 
 libchamplain_1_0_la_LIBADD = $(DEPS_LIBS) ../tidy/libtidy-1.0.la
 
-EXTRA_DIST = $(CHAMPLAIN_MARSHAL_LIST)
-        
 champlain-marshal.h: $(CHAMPLAIN_MARSHAL_LIST)
 	@GLIB_GENMARSHAL@ --header --prefix=champlain_marshal $< > $(CHAMPLAIN_MARSHAL).h 
 
@@ -42,7 +40,12 @@ libchamplain_1_0_la_LDFLAGS= -version-info $(LIBRARY_VERSION)
 
 noinst_PROGRAMS = launcher
 
-AM_CPPFLAGS = $(DEPS_CFLAGS) -I../tidy
+AM_CPPFLAGS = $(DEPS_CFLAGS) -DDATADIR=\""$(datadir)"\" -I../tidy 
 AM_LDFLAGS = $(DEPS_LIBS) -export-dynamic -export-symbols-regex ^champlain_.*
 SOURCES = launcher.c
 LDADD = $(DEPS_LIBS) $(top_builddir)/champlain/libchamplain-1.0.la
+
+svgdir = $(datadir)/champlain
+svg_DATA = error.svg
+
+EXTRA_DIST = $(svg_DATA) $(CHAMPLAIN_MARSHAL_LIST)
diff --git a/champlain/marker.svg b/champlain/marker.svg
deleted file mode 100644
index 426e2b4..0000000
--- a/champlain/marker.svg
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="35"
-   height="30"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="marker.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3172">
-      <stop
-         style="stop-color:#292929;stop-opacity:1;"
-         offset="0"
-         id="stop3174" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop3176" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3276">
-      <stop
-         id="stop3278"
-         offset="0"
-         style="stop-color:#aeaeae;stop-opacity:1;" />
-      <stop
-         id="stop3280"
-         offset="1"
-         style="stop-color:#292929;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3265">
-      <stop
-         style="stop-color:#aeaeae;stop-opacity:1;"
-         offset="0"
-         id="stop3267" />
-      <stop
-         style="stop-color:#646464;stop-opacity:1;"
-         offset="1"
-         id="stop3269" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3173">
-      <stop
-         id="stop3175"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3177"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3161">
-      <stop
-         style="stop-color:#7abcf6;stop-opacity:0.65756822;"
-         offset="0"
-         id="stop3163" />
-      <stop
-         style="stop-color:#1e3f93;stop-opacity:1;"
-         offset="1"
-         id="stop3165" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3161"
-       id="radialGradient3167"
-       cx="25.496302"
-       cy="16.96435"
-       fx="25.496302"
-       fy="16.96435"
-       r="9.9878836"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1119019,-0.3926904,0.3681401,1.0423882,-9.2271884,9.0825785)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3173"
-       id="linearGradient3183"
-       gradientUnits="userSpaceOnUse"
-       x1="16.472187"
-       y1="0.4706561"
-       x2="31.611408"
-       y2="23.559767" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3173"
-       id="radialGradient3253"
-       cx="22.892582"
-       cy="13.571884"
-       fx="22.892582"
-       fy="13.571884"
-       r="9.9878836"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3265"
-       id="linearGradient3271"
-       x1="21.344669"
-       y1="29.969669"
-       x2="24.219669"
-       y2="29.969669"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3276"
-       id="linearGradient3274"
-       gradientUnits="userSpaceOnUse"
-       x1="21.896049"
-       y1="29.969669"
-       x2="24.219669"
-       y2="29.969669"
-       gradientTransform="matrix(1.8694361,1.0793193,-0.8252457,1.4293671,-12.483425,-40.741957)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3172"
-       id="linearGradient3178"
-       x1="-8.25"
-       y1="11.0625"
-       x2="-17.5"
-       y2="11.0625"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.5813953,0,0,0.5779468,25.550079,8.1463472)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3172"
-       id="linearGradient3181"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4111086,0.4111086,-0.4086701,0.4086701,14.790054,23.826972)"
-       x1="-9.3749914"
-       y1="11.276593"
-       x2="-16.546461"
-       y2="11.104118" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3161"
-       id="radialGradient3187"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1119019,-0.3926904,0.3681401,1.0423882,-9.2271884,9.0825785)"
-       cx="25.496302"
-       cy="16.96435"
-       fx="25.496302"
-       fy="16.96435"
-       r="9.9878836" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3172"
-       id="linearGradient3189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4111086,0.4111086,-0.4086701,0.4086701,31.894923,38.209455)"
-       x1="-8.25"
-       y1="11.0625"
-       x2="-17.5"
-       y2="11.0625" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3172"
-       id="linearGradient3192"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.4111086,0.4111086,-0.4086701,0.4086701,32.519923,38.084455)"
-       x1="-8.25"
-       y1="11.0625"
-       x2="-17.5"
-       y2="11.0625" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3161"
-       id="radialGradient3194"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0279367,-0.3630364,0.34034,0.9636724,5.4497218,19.859622)"
-       cx="25.496302"
-       cy="16.96435"
-       fx="25.496302"
-       fy="16.96435"
-       r="9.9878836" />
-    <filter
-       inkscape:collect="always"
-       id="filter3317"
-       x="-0.04798371"
-       width="1.0959674"
-       y="-0.1926285"
-       height="1.385257">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.66717682"
-         id="feGaussianBlur3319" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="-7.719398"
-     inkscape:cy="3.1957276"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1279"
-     inkscape:window-height="948"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="opacity:1;fill:url(#linearGradient3181);fill-opacity:1;stroke:none;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 10.408918,15.052632 L 12.618627,17.262341 L 0.8085986,28.07237 L 0.03638916,27.300161 L 10.408918,15.052632 z"
-       id="rect3170"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="opacity:0.85493828;fill:#000000;fill-opacity:0.21495325;stroke:none;stroke-width:0.46224254;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3317)"
-       d="M 27.15625,19.78125 C 22.059275,19.78125 16.448206,21.024325 14.645196,22.561508 C 13.895778,23.200435 13.943019,23.787868 14.5929,24.257937 L 0.3076105,27.858135 L 0.78125,28.09375 L 16.122449,24.89881 C 17.235364,25.181054 18.775434,25.35119 20.623087,25.35119 C 25.720062,25.35119 31.310934,24.098691 33.113946,22.561508 C 34.916957,21.024325 32.253225,19.78125 27.15625,19.78125 z"
-       id="path3183" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.85493828;fill:url(#radialGradient3167);fill-opacity:1;stroke:#1f60a3;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2389"
-       sodipodi:cx="22.892582"
-       sodipodi:cy="13.571884"
-       sodipodi:rx="9.9878836"
-       sodipodi:ry="9.9878836"
-       d="M 32.880466,13.571884 A 9.9878836,9.9878836 0 1 1 12.904698,13.571884 A 9.9878836,9.9878836 0 1 1 32.880466,13.571884 z"
-       transform="matrix(0.9244851,0,0,0.9244851,-3.1247491,-2.919569)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.57975458;fill:url(#radialGradient3253);fill-opacity:1;stroke:none;stroke-width:7.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path3169"
-       sodipodi:cx="22.892582"
-       sodipodi:cy="13.571884"
-       sodipodi:rx="9.9878836"
-       sodipodi:ry="9.9878836"
-       d="M 32.880466,13.571884 A 9.9878836,9.9878836 0 1 1 12.904698,13.571884 A 9.9878836,9.9878836 0 1 1 32.880466,13.571884 z"
-       transform="matrix(0.2988783,0,0,0.2988783,7.9134402,2.1719676)" />
-  </g>
-</svg>
diff --git a/champlain/tile.c b/champlain/tile.c
index bcc4ad9..40e5a92 100644
--- a/champlain/tile.c
+++ b/champlain/tile.c
@@ -56,7 +56,7 @@ tile_setup_animation(Tile* tile)
 static void 
 create_error_tile(Map* map, Tile* tile)
 {
-  tile->actor = clutter_texture_new_from_file("error.svg", NULL);
+  tile->actor = clutter_texture_new_from_file(DATADIR "/champlain/error.svg", NULL);
        
   tile_set_position(map, tile);
   
-- 
2.39.5