[openoffice.org/f14/master] Resolves: rhbz#649824 wrong gconf key being looked up

[Caolan McNamara]

commit 647ea539e4830fa3eee791c0905249c7e641066e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 5 15:30:07 2010 +0000

    Resolves: rhbz#649824 wrong gconf key being looked up

 0001-rhbz-649824-this-key-name-is-wrong.patch |   25 +++++++++++++++++++++++++
 openoffice.org.spec                           |    5 ++++-
 2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/0001-rhbz-649824-this-key-name-is-wrong.patch b/0001-rhbz-649824-this-key-name-is-wrong.patch
new file mode 100644
index 0000000..5842880
--- /dev/null
+++ b/0001-rhbz-649824-this-key-name-is-wrong.patch
@@ -0,0 +1,25 @@
+From fa42616b7c5e03ff9967afd826a2da5e95e855c9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Fri, 5 Nov 2010 15:25:06 +0000
+Subject: [PATCH] rhbz#649824# this key name is wrong
+
+---
+ shell/source/backends/gconfbe/gconfaccess.cxx |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
+index 95d2472..ff906fe 100644
+--- a/shell/source/backends/gconfbe/gconfaccess.cxx
++++ b/shell/source/backends/gconfbe/gconfaccess.cxx
+@@ -765,7 +765,7 @@ ConfigurationValue const ConfigurationValues[] =
+     {
+         SETTING_REMOVE_PERSONAL_INFO,
+         "/apps/openoffice/lockdown/remove_personal_info_on_save",
+-        "Scripting/RemovePersonalInfoOnSaving",
++        "RemovePersonalInfoOnSaving",
+         sal_False,
+         SETTINGS_LAST
+     },
+-- 
+1.7.3.1
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 616f113..5a1ab5f 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -135,6 +135,7 @@ Patch49: 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
 Patch50: 0001-include-redland.h-instead-of-librdf.h.patch
 Patch51: 0001-rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
 Patch52: 0001-abort-doesn-t-gain-us-anything-here.patch
+Patch53: 0001-rhbz-649824-this-key-name-is-wrong.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1684,6 +1685,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch50 -p1 -b .include-redland.h-instead-of-librdf.h.patch
 %patch51 -p1 -b .rhbz-648475-crash-in-scanner-dialog-reset-link-in-dt.patch
 %patch52 -p1 -b .abort-doesn-t-gain-us-anything-here.patch
+%patch53 -p1 -b .rhbz-649824-this-key-name-is-wrong.patch
 rm -rf l10n/source/kid  # rhbz#639212
 
 %build
@@ -3886,8 +3888,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
-* Wed Nov 03 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-13.4
+* Fri Nov 05 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-13.4
 - Resolves: rhbz#649210 add Sinhalese langpack
+- Resolves: rhbz#649824 wrong gconf key being looked up
 
 * Mon Nov 01 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-13.3
 - Resolves: rhbz#648475 Crash in scanner dialog