diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-24 19:16:06 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-09-24 19:16:06 (GMT) |
commit | a8969d776fc4ca138c925d6756804300cbaef2ae (patch) | |
tree | 1766edb1a05eff7b5170acbbc807129dff7775dd | |
parent | 9b68754ba5c1f63d7ca6adfee3ef6114628c175e (diff) |
Ship the startup sound with sugar
-rw-r--r-- | data/Makefile.am | 1 | ||||
-rw-r--r-- | data/startup.flac | bin | 0 -> 56365 bytes | |||
-rwxr-xr-x | shell/sugar-shell | 2 | ||||
-rw-r--r-- | sugar/env.py | 3 |
4 files changed, 2 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 887ed4a..addfb59 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,6 +10,7 @@ sugardir = $(pkgdatadir)/data sugar_DATA = \ activities.defaults \ mime.defaults \ + startup.flac \ $(GTKRC_FILES) GTKRC_FILES = \ diff --git a/data/startup.flac b/data/startup.flac Binary files differnew file mode 100644 index 0000000..d79950e --- /dev/null +++ b/data/startup.flac diff --git a/shell/sugar-shell b/shell/sugar-shell index 106a9d7..63225fc 100755 --- a/shell/sugar-shell +++ b/shell/sugar-shell @@ -88,7 +88,7 @@ def _shell_started_cb(): hw_manager = hardwaremanager.get_manager() hw_manager.set_dcon_freeze(0) - startup_sound = os.path.join(env.get_sounds_path('startup.ogg')) + startup_sound = os.path.join(env.get_data_path('startup.flac')) if os.path.exists(startup_sound): player = gst.element_factory_make("playbin", "player") player.set_property("uri", "file://" + startup_sound) diff --git a/sugar/env.py b/sugar/env.py index 5f50d3c..e3e0a51 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -73,9 +73,6 @@ def get_user_library_path(): def get_locale_path(path=None): return _get_prefix_path('share/locale', path) -def get_sounds_path(path=None): - return _get_prefix_path('share/sounds', path) - def get_bin_path(path=None): return _get_sugar_path('bin', path) |