From 7f4d8d110ff3babde1aaede01244cf8f75fe3b3a Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 22 May 2009 17:35:25 +0100
Subject: settings-daemon: Add sound theme gconf key handling

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../settings-daemon/files/addsoundkeys.patch       | 47 ++++++++++++++++++++++
 .../settings-daemon/settings-daemon_svn.bb         |  5 ++-
 2 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 meta/packages/settings-daemon/files/addsoundkeys.patch

(limited to 'meta/packages')

diff --git a/meta/packages/settings-daemon/files/addsoundkeys.patch b/meta/packages/settings-daemon/files/addsoundkeys.patch
new file mode 100644
index 000000000..e06f02917
--- /dev/null
+++ b/meta/packages/settings-daemon/files/addsoundkeys.patch
@@ -0,0 +1,47 @@
+Index: settings-daemon/settings-daemon.c
+===================================================================
+--- settings-daemon.orig/settings-daemon.c	2009-05-22 14:57:05.000000000 +0100
++++ settings-daemon/settings-daemon.c	2009-05-22 14:58:22.000000000 +0100
+@@ -187,6 +187,10 @@
+     GCONF_VALUE_STRING, translate_string_string },
+   { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme",
+     GCONF_VALUE_STRING, translate_string_string },
++  { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName",
++    GCONF_VALUE_STRING,   translate_string_string },
++  { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" ,
++    GCONF_VALUE_BOOL,     translate_bool_int },
+ };
+ 
+ static const TranslationEntry*
+Index: settings-daemon/settings-daemon.schemas
+===================================================================
+--- settings-daemon.orig/settings-daemon.schemas	2009-05-22 15:49:17.000000000 +0100
++++ settings-daemon/settings-daemon.schemas	2009-05-22 15:51:31.000000000 +0100
+@@ -196,6 +196,27 @@
+     </locale>
+   </schema>
+ 
++  <schema>
++    <key>/schemas/desktop/gnome/sound/theme_name</key>
++    <applyto>/desktop/gnome/sound/theme_name</applyto>
++    <owner>gnome</owner>
++    <type>string</type>
++    <default>freedesktop</default>
++    <locale name="C">
++      <short>Sound Theme Name</short>
++    </locale>
++  </schema>
++
++  <schema>
++    <key>/schemas/desktop/gnome/sound/event_sounds</key>
++    <applyto>/desktop/gnome/sound/event_sounds</applyto>
++    <owner>gnome</owner>
++    <type>bool</type>
++    <default>true</default>
++    <locale name="C">
++      <short>Enable Sound Events</short>
++    </locale>
++  </schema>
+ 
+ </schemalist>
+ </gconfschemafile>
diff --git a/meta/packages/settings-daemon/settings-daemon_svn.bb b/meta/packages/settings-daemon/settings-daemon_svn.bb
index b4be316af..225edacdd 100644
--- a/meta/packages/settings-daemon/settings-daemon_svn.bb
+++ b/meta/packages/settings-daemon/settings-daemon_svn.bb
@@ -4,10 +4,11 @@ DEPENDS = "gconf glib-2.0 gtk+"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
-	   file://70settings-daemon.sh"
+           file://addsoundkeys.patch;patch=1 \
+           file://70settings-daemon.sh"
 
 S = "${WORKDIR}/${PN}"
 
-- 
cgit v1.2.3