Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <mpg@redhat.com>2007-03-09 13:07:17 (GMT)
committer Marco Pesenti Gritti <mpg@redhat.com>2007-03-09 13:07:17 (GMT)
commita380b7f915ca32293315176027f835fb739bb86b (patch)
treef37d51f6d41488dfe6e9f8cc7ce008fab7dfd205
parent73c1dbe4a7d8b5e54b6c16f82690200abaedf978 (diff)
Move data to be relative to the code.
-rw-r--r--shell/data/Makefile.am5
-rw-r--r--shell/intro/Makefile.am4
-rw-r--r--shell/intro/default-picture.png (renamed from shell/data/default-picture.png)bin10442 -> 10442 bytes
-rw-r--r--shell/intro/intro.py3
4 files changed, 7 insertions, 5 deletions
diff --git a/shell/data/Makefile.am b/shell/data/Makefile.am
index 2709c92..1f0f9c0 100644
--- a/shell/data/Makefile.am
+++ b/shell/data/Makefile.am
@@ -1,7 +1,4 @@
confdir = $(pkgdatadir)
conf_DATA = kbdconfig
-imagedir = $(pkgdatadir)
-image_DATA = default-picture.png
-
-EXTRA_DIST = $(conf_DATA) $(image_DATA)
+EXTRA_DIST = $(conf_DATA)
diff --git a/shell/intro/Makefile.am b/shell/intro/Makefile.am
index cc11aa9..3b92ea0 100644
--- a/shell/intro/Makefile.am
+++ b/shell/intro/Makefile.am
@@ -1,3 +1,7 @@
+imagedir = $(pkgdatadir)/shell/intro
+image_DATA = default-picture.png
+
+EXTRA_DIST = $(conf_DATA) $(image_DATA)
sugardir = $(pkgdatadir)/shell/intro
sugar_PYTHON = \
__init__.py \
diff --git a/shell/data/default-picture.png b/shell/intro/default-picture.png
index e26b9b0..e26b9b0 100644
--- a/shell/data/default-picture.png
+++ b/shell/intro/default-picture.png
Binary files differ
diff --git a/shell/intro/intro.py b/shell/intro/intro.py
index 55aa135..cdcc2a3 100644
--- a/shell/intro/intro.py
+++ b/shell/intro/intro.py
@@ -143,7 +143,8 @@ class VideoBox(hippo.CanvasBox, hippo.CanvasItem):
self._img_widget.props.widget = self._img
if not has_webcam:
- path = os.path.join(env.get_data_dir(),'default-picture.png')
+ path = os.path.join(os.path.dirname(__file__),
+ 'default-picture.png')
self._video.load_image(path)
def _clear_image_cb(self, widget, event):