r32661 - in /desktop/unstable/gconf/debian: changelog control patches/05_readd_gconf_engine_key_is_writable.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Thu Feb 23 16:54:14 2012
New Revision: 32661

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32661
Log:
Add debian/patches/05_readd_gconf_engine_key_is_writable.patch: Add
missing function in D-Bus variant that causes ABI breakage (Closes: #649112)

Added:
    desktop/unstable/gconf/debian/patches/05_readd_gconf_engine_key_is_writable.patch
Modified:
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/control
    desktop/unstable/gconf/debian/patches/series

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=32661&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Thu Feb 23 16:54:14 2012
@@ -1,5 +1,6 @@
 gconf (3.2.3-2) UNRELEASED; urgency=low
 
+  [ Michael Biebl ]
   * debian/libgconf2-dev.install:
     - Remove libtool .la files.
   * debian/control.in:
@@ -8,7 +9,11 @@
   * Rely on cdbs to call dh_girepository. Bump Build-Depends accordingly.
   * Switch to dh_python2.
 
- -- Michael Biebl <biebl at debian.org>  Thu, 15 Dec 2011 02:02:43 +0100
+  [ Laurent Bigonville ]
+  * Add debian/patches/05_readd_gconf_engine_key_is_writable.patch: Add
+    missing function in D-Bus variant that causes ABI breakage (Closes: #649112)
+
+ -- Laurent Bigonville <bigon at debian.org>  Thu, 23 Feb 2012 17:46:51 +0100
 
 gconf (3.2.3-1) unstable; urgency=low
 

Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=32661&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control [utf-8] (original)
+++ desktop/unstable/gconf/debian/control [utf-8] Thu Feb 23 16:54:14 2012
@@ -7,7 +7,7 @@
 Section: libs
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.90),
                gnome-pkg-tools (>= 0.14),

Added: desktop/unstable/gconf/debian/patches/05_readd_gconf_engine_key_is_writable.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/05_readd_gconf_engine_key_is_writable.patch?rev=32661&op=file
==============================================================================
--- desktop/unstable/gconf/debian/patches/05_readd_gconf_engine_key_is_writable.patch (added)
+++ desktop/unstable/gconf/debian/patches/05_readd_gconf_engine_key_is_writable.patch [utf-8] Thu Feb 23 16:54:14 2012
@@ -1,0 +1,49 @@
+From 7fc5106b58e9270e0d92b4c054a120628320b410 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz at gnome.org>
+Date: Tue, 21 Feb 2012 15:26:47 +0100
+Subject: [PATCH] gconf-dbus: Add gconf_engine_key_is_writable()
+
+This went missing in the dbus port, and so we broke ABI.
+It's really the same code as in the corba code.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=668948
+---
+ gconf/gconf-dbus.c |   23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
+
+diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
+index 442a94b..9eda515 100644
+--- a/gconf/gconf-dbus.c
++++ b/gconf/gconf-dbus.c
+@@ -2194,6 +2194,29 @@ gconf_engine_remove_dir (GConfEngine* conf,
+     }
+ }
+ 
++gboolean
++gconf_engine_key_is_writable (GConfEngine *conf,
++                              const gchar *key,
++                              GError     **err)
++{
++  gboolean is_writable = TRUE;
++  GConfValue *val;
++
++  CHECK_OWNER_USE (conf);
++
++  /* FIXME implement IDL to allow getting only writability
++   * (not that urgent since GConfClient caches this crap
++   * anyway)
++   */
++
++  val = gconf_engine_get_full(conf, key, NULL, TRUE,
++                              NULL, &is_writable, err);
++
++  gconf_value_free (val);
++
++  return is_writable;
++}
++
+ static void
+ cnxn_get_all_func (gpointer key,
+ 		   gpointer value,
+-- 
+1.7.9

Modified: desktop/unstable/gconf/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/patches/series?rev=32661&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gconf/debian/patches/series [utf-8] Thu Feb 23 16:54:14 2012
@@ -1,4 +1,5 @@
 01_defaults_path.patch
 02_fix_wrong_return_value.patch
 04_manpage.patch
+05_readd_gconf_engine_key_is_writable.patch
 25_gconf-path-max-hurd.patch