--- a/ChangeLog	Tue Mar 31 09:53:29 2009 +0000
+++ b/ChangeLog	Tue Apr 07 03:35:59 2009 +0000
@@ -1,3 +1,9 @@
+2009-04-07  Lin Ma  <[email protected]>
+
+	* base-specs/gnome-settings-daemon.spec:
+	* patches/gnome-settings-daemon-10-default-keybinding.diff:
+	New branding patch for CR#6746963.
+
 2009-03-31  Ginn Chen  <[email protected]>
 
 	* base-specs/firefox.spec: Add 2 patches

--- a/base-specs/gnome-settings-daemon.spec	Tue Mar 31 09:53:29 2009 +0000
+++ b/base-specs/gnome-settings-daemon.spec	Tue Apr 07 03:35:59 2009 +0000
@@ -40,6 +40,8 @@
 Patch8:      gnome-settings-daemon-08-find-xrdb.diff
 # date:2008-12-03 owner:dkenny type:bug bugster:6778267
 Patch9:      gnome-settings-daemon-09-broken-device-presence.diff
+# date:2009-04-07 owner:lin type:branding bugzilla:6746963
+Patch10:     gnome-settings-daemon-10-default-keybinding.diff
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -107,6 +109,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # Rename dir so that #include does not have to change on gnome-control-center.
 # Combines with patch mv-src-dir.diff (see bugzilla 511820).
@@ -218,6 +221,8 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 07 2009 - [email protected]
+- Add patch 10 for fix bugzilla 6746963.
 * Wed Dec 03 2008 - [email protected]
 - Add patch gnome-settings-daemon-09-broken-device-presence.diff to
   temporarily backout fix from community until the bug 6778267 is fixed in

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-settings-daemon-10-default-keybinding.diff	Tue Apr 07 03:35:59 2009 +0000
@@ -0,0 +1,40 @@
+diff --git a/data/apps_gnome_settings_daemon_keybindings.schemas.in b/data/apps_gnome_settings_daemon_keybindings.schemas.in
+index ac3e312..66a2c51 100644
+--- a/data/apps_gnome_settings_daemon_keybindings.schemas.in
++++ b/data/apps_gnome_settings_daemon_keybindings.schemas.in
+@@ -17,7 +17,7 @@
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_mute</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/volume_mute</applyto>
+             <type>string</type>
+-            <default>XF86AudioMute</default>
++            <default>SunAudioMute</default>
+             <locale name="C">
+                 <short>Volume mute</short>
+                 <long>Binding to mute the system volume.</long>
+@@ -29,7 +29,7 @@
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_down</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/volume_down</applyto>
+             <type>string</type>
+-            <default>XF86AudioLowerVolume</default>
++            <default>SunAudioLowerVolume</default>
+             <locale name="C">
+                 <short>Volume down</short>
+                 <long>Binding to lower the system volume.</long>
+@@ -41,7 +41,7 @@
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/volume_up</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/volume_up</applyto>
+             <type>string</type>
+-            <default>XF86AudioRaiseVolume</default>
++            <default>SunAudioRaiseVolume</default>
+             <locale name="C">
+                 <short>Volume up</short>
+                 <long>Binding to raise the system volume.</long>
+@@ -113,7 +113,7 @@
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/sleep</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/sleep</applyto>
+             <type>string</type>
+-            <default></default>
++            <default>SunPowerSwitch</default>
+             <locale name="C">
+                 <short>Suspend</short>
+                 <long>Binding to suspend the computer.</long>