rpms/GConf2/devel GConf2-2.13.5-sync-less.patch, NONE, 1.1 GConf2.spec, 1.38, 1.39

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/GConf2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19617

Modified Files:
	GConf2.spec 
Added Files:
	GConf2-2.13.5-sync-less.patch 
Log Message:
- Only sync the database once when installing multiple
  schema files.  Patch by Josselin Mouette <joss at debian.org>.
  (upstream bug 333353)


GConf2-2.13.5-sync-less.patch:
 gconftool.c |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

--- NEW FILE GConf2-2.13.5-sync-less.patch ---
--- GConf2-2.13.5/gconf/gconftool.c	2006-03-03 14:30:01.000000000 +0100
+++ GConf2-2.13.5/gconf/gconftool.c	2006-03-03 14:38:46.000000000 +0100
@@ -476,6 +476,7 @@
 static int do_recursive_unset (GConfEngine* conf, const gchar** args);
 static int do_all_subdirs(GConfEngine* conf, const gchar** args);
 static int do_load_file(GConfEngine* conf, LoadType load_type, gboolean unload, const gchar* file, const gchar** base_dirs);
+static int do_sync(GConfEngine* conf);
 static int do_short_docs (GConfEngine *conf, const gchar **args);
 static int do_long_docs (GConfEngine *conf, const gchar **args);
 static int do_get_schema_name (GConfEngine *conf, const gchar **args);
@@ -841,6 +842,8 @@
       gint retval;
 
       retval = do_load_file(conf, LOAD_SCHEMA_FILE, FALSE, schema_file, NULL);
+      if (!retval)
+	retval = do_sync(conf);
 
       gconf_engine_unref(conf);
 
@@ -853,6 +856,8 @@
       gint retval;
 
       retval = do_load_file(conf, LOAD_ENTRY_FILE, FALSE, entry_file, args);
+      if (!retval)
+	retval = do_sync(conf);
 
       gconf_engine_unref(conf);
 
@@ -865,6 +870,8 @@
       gint retval;
 
       retval = do_load_file(conf, LOAD_ENTRY_FILE, TRUE, unload_entry_file, args);
+      if (!retval)
+	retval = do_sync(conf);
 
       gconf_engine_unref(conf);
 
@@ -3629,7 +3636,6 @@
 
   xmlDocPtr doc;
   xmlNodePtr iter;
-  GError * err = NULL;
   /* file comes from the command line, is thus in locale charset */
   gchar *utf8_file = g_locale_to_utf8 (file, -1, NULL, NULL, NULL);;
 
@@ -3691,7 +3697,17 @@
           
       iter = iter->next;
     }
+  
+  return 0;
+#undef LOAD_TYPE_TO_LIST
+#undef LOAD_TYPE_TO_ROOT
+}
 
+static int
+do_sync(GConfEngine* conf)
+{
+  GError * err = NULL;
+  
   gconf_engine_suggest_sync(conf, &err);
 
   if (err != NULL)
@@ -3703,9 +3719,6 @@
     }
   
   return 0;
-
-#undef LOAD_TYPE_TO_LIST
-#undef LOAD_TYPE_TO_ROOT
 }
 
 static int



Index: GConf2.spec
===================================================================
RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- GConf2.spec	15 Feb 2006 15:39:45 -0000	1.38
+++ GConf2.spec	6 Mar 2006 16:03:42 -0000	1.39
@@ -5,7 +5,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.13.5
-Release: 4
+Release: 5
 License: LGPL
 Group: System Environment/Base
 Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2
@@ -23,6 +23,9 @@
 BuildRequires: gettext
 BuildRequires: openldap-devel
 
+Patch0: GConf2-2.8.1-reload.patch
+Patch1: GConf2-2.13.5-sync-less.patch
+
 %description
 GConf is a process-transparent configuration database API used to 
 store user preferences. It has pluggable backends and features to 
@@ -36,8 +39,6 @@
 Requires: ORBit2-devel >= %{orbit2_version}
 Requires: glib2-devel >= %{glib2_version}
 
-Patch1: GConf2-2.8.1-reload.patch
-
 
 %description devel
 GConf development package. Contains files needed for doing
@@ -45,7 +46,8 @@
 
 %prep
 %setup -q -n GConf-%{version}
-%patch1 -p1 -b .reload
+%patch0 -p1 -b .reload
+%patch1 -p1 -b .sync-less
 
 %build
 %configure
@@ -101,6 +103,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Mar  6 2006 Ray Strode <rstrode at redhat.com> 2.13.5-5
+- Only sync the database once when installing multiple
+  schema files.  Patch by Josselin Mouette <joss at debian.org>.
+  (upstream bug 333353)
+
 * Wed Feb 15 2006 Christopher Aillon <caillon at redhat.com> 2.13.5-4
 - Send SIGTERM instead of SIGHUP to gconfd