[meego-commits] 8830: Changes to Trunk:Netbook/gnome-settings-daemon

[Zhang Qiang]

Hi,
I have made the following changes to gnome-settings-daemon in project Trunk:Netbook. Please review and accept ASAP.

Thank You,
Zhang Qiang

[This message was auto-generated]

---

Request #8830:

  submit:   home:xiaoqiang:branches:Trunk:Netbook/gnome-settings-daemon(r2)(cleanup) -> Trunk:Netbook/gnome-settings-daemon


Message:
    Add Disable-Log-out-keybindings.patch to diable Log out keybindings, as gnome-session stuff is not exist in netbook image now. fix BMC#8830

State:   new          2010-10-25T22:49:25 xiaoqiang
Comment: None



changes files:
--------------
--- gnome-settings-daemon.changes
+++ gnome-settings-daemon.changes
@@ -0,0 +1,5 @@
+* Tue Oct 26 2010 Zhang Qiang <qiang.z.zhang at intel.com> 2.30.0
+- Add Disable-Log-out-keybindings.patch to diable Log out  
+  keybindings, as gnome-session stuff is not exist in netbook 
+  image now. fix BMC#8830
+

new:
----
  Disable-Log-out-keybindings.patch

spec files:
-----------
--- gnome-settings-daemon.spec
+++ gnome-settings-daemon.spec
@@ -52,6 +52,7 @@
 #Upstream patch
 Patch16: touchpad-OSD.patch
 Patch17: gnome-settings-daemon-2.30.0-2122-mount-translations.patch
+Patch18: Disable-Log-out-keybindings.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -88,6 +89,7 @@
 #%patch15 -p1 -b .baobob
 %patch16 -p1 -b .touchpad-OSD
 %patch17 -p1 -b .mount-translations
+%patch18 -p1 -b .Disable-Log-out-keybindings
 
 %build
 aclocal

other changes:
--------------

++++++ Disable-Log-out-keybindings.patch (new)
--- Disable-Log-out-keybindings.patch
+++ Disable-Log-out-keybindings.patch
+diff -uNr gnome-settings-daemon-2.30.2/data/apps_gnome_settings_daemon_keybindings.schemas.in gnome-settings-daemon-2.30.2.new/data/apps_gnome_settings_daemon_keybindings.schemas.in
+--- gnome-settings-daemon-2.30.2/data/apps_gnome_settings_daemon_keybindings.schemas.in	2010-10-26 13:52:54.280456404 +0800
++++ gnome-settings-daemon-2.30.2.new/data/apps_gnome_settings_daemon_keybindings.schemas.in	2010-10-26 13:56:08.474581058 +0800
+@@ -61,18 +61,6 @@
+ 
+ 
+         <schema>
+-            <key>/schemas/apps/gnome_settings_daemon/keybindings/power</key>
+-            <applyto>/apps/gnome_settings_daemon/keybindings/power</applyto>
+-            <type>string</type>
+-            <default><Control><Alt>Delete</default>
+-            <locale name="C">
+-                <short>Log out</short>
+-                <long>Binding to log out.</long>
+-            </locale>
+-        </schema>
+-
+-
+-        <schema>
+             <key>/schemas/apps/gnome_settings_daemon/keybindings/eject</key>
+             <applyto>/apps/gnome_settings_daemon/keybindings/eject</applyto>
+             <type>string</type>