From 5218bf6898d0e2b7bef420d3d7d4610e5743512d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@fedoraproject.org>
Date: Mon, 1 Feb 2010 19:24:34 +0000
Subject: [PATCH] - Add defaults patch from f-12 branch

---
 ...s-mechanism-find-the-right-polkit-ac.patch | 47 +++++++++++++++++++
 GConf2.spec                                   |  6 +--
 2 files changed, 50 insertions(+), 3 deletions(-)
 create mode 100644 0001-Make-the-defaults-mechanism-find-the-right-polkit-ac.patch

diff --git a/0001-Make-the-defaults-mechanism-find-the-right-polkit-ac.patch b/0001-Make-the-defaults-mechanism-find-the-right-polkit-ac.patch
new file mode 100644
index 0000000..9d2027d
--- /dev/null
+++ b/0001-Make-the-defaults-mechanism-find-the-right-polkit-ac.patch
@@ -0,0 +1,47 @@
+From 67a2478f610be4beff34258a5a5b36243415b069 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 19 Jan 2010 20:36:03 -0500
+Subject: [PATCH] Make the defaults mechanism find the right polkit action
+
+Due to a thinko in the code, the mechanism was always using the
+default privileges.
+---
+ defaults/gconf-defaults.c |    7 ++++---
+ 1 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/defaults/gconf-defaults.c b/defaults/gconf-defaults.c
+index 11a38ad..b84c632 100644
+--- a/defaults/gconf-defaults.c
++++ b/defaults/gconf-defaults.c
+@@ -286,8 +286,8 @@ polkit_action_for_gconf_path (GConfDefaults *mechanism,
+         PolkitActionDescription *action_description;
+ 	const gchar *annotation;
+ 
++	g_debug ("finding action for path '%s'", path);
+ 	prefix = g_strdup (path);
+-
+ 	while (1) {
+                 for (l = action_descriptions; l; l = l->next) {
+ 			action_description = l->data;
+@@ -295,8 +295,8 @@ polkit_action_for_gconf_path (GConfDefaults *mechanism,
+ 			annotation = polkit_action_description_get_annotation (action_description, annotation_key);
+ 			if (g_strcmp0 (prefix, annotation) == 0) {
+ 				action = polkit_action_description_get_action_id (action_description);
+-				g_debug ("action for path '%s': '%s'\n", action, path);
+-				break;
++				g_debug ("action for prefix '%s': '%s'\n", prefix, action);
++				goto found;
+ 			}
+ 		}
+ 
+@@ -310,6 +310,7 @@ polkit_action_for_gconf_path (GConfDefaults *mechanism,
+ 		*p = 0;
+ 	}
+ 
++ found:
+ 	g_free (prefix);
+ 
+ 	return action;
+-- 
+1.6.6
+
diff --git a/GConf2.spec b/GConf2.spec
index 4980db9..80c4f4a 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.28.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.28/GConf-%{version}.tar.bz2
@@ -160,8 +160,8 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Mon Feb 01 2010 Colin Walters <walters@verbum.org> 2.28.0-7
-- bump
+* Mon Feb 01 2010 Colin Walters <walters@verbum.org> 2.28.0-8
+- Add defaults patch from f-12 branch 
 
 * Mon Feb 01 2010 Colin Walters <walters@verbum.org> 2.28.0-6
 - Do not catch segv etc. let abrt catch them