[dconf/dconf-0.14] engine/: drop DConfChangesetList

[Ryan Lortie <ryanl src gnome org>]

commit b5f59c954ca7644adc98111bf82e80d6271372a5
Author: Ryan Lortie <desrt desrt ca>
Date:   Tue Oct 2 13:29:01 2012 -0400

    engine/: drop DConfChangesetList
    
    It's really just a GQueue...
    
    https://bugzilla.gnome.org/show_bug.cgi?id=685316

 engine/Makefile.am            |    1 -
 engine/dconf-changeset-list.h |   38 --------------------------------------
 engine/dconf-engine.c         |    8 ++++----
 engine/dconf-engine.h         |    4 ++--
 4 files changed, 6 insertions(+), 45 deletions(-)
---
diff --git a/engine/Makefile.am b/engine/Makefile.am
index 8f0f8f2..b69c70c 100644
--- a/engine/Makefile.am
+++ b/engine/Makefile.am
@@ -4,7 +4,6 @@ noinst_LIBRARIES = libdconf-engine.a libdconf-engine-shared.a
 
 libdconf_engine_a_CFLAGS = $(glib_CFLAGS)
 libdconf_engine_a_SOURCES = \
-	dconf-changeset-list.h		\
 	dconf-engine-profile.h		\
 	dconf-engine-profile.c		\
 	dconf-engine-source-private.h	\
diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c
index 89a0c67..30c4881 100644
--- a/engine/dconf-engine.c
+++ b/engine/dconf-engine.c
@@ -376,9 +376,9 @@ dconf_engine_find_key_in_queue (GQueue       *queue,
 }
 
 GVariant *
-dconf_engine_read (DConfEngine        *engine,
-                   DConfChangesetList *read_through,
-                   const gchar        *key)
+dconf_engine_read (DConfEngine *engine,
+                   GQueue      *read_through,
+                   const gchar *key)
 {
   GVariant *value = NULL;
   gint lock_level = 0;
@@ -500,7 +500,7 @@ dconf_engine_read (DConfEngine        *engine,
 
       /* Step 2.  Check read_through. */
       if (read_through)
-        found_key = dconf_engine_find_key_in_queue (&read_through->queue, key, &value);
+        found_key = dconf_engine_find_key_in_queue (read_through, key, &value);
 
       /* Step 3.  Check queued changes if we didn't find it in read_through.
        *
diff --git a/engine/dconf-engine.h b/engine/dconf-engine.h
index 3c65e87..a52e971 100644
--- a/engine/dconf-engine.h
+++ b/engine/dconf-engine.h
@@ -22,7 +22,7 @@
 #ifndef __dconf_engine_h__
 #define __dconf_engine_h__
 
-#include "dconf-changeset-list.h"
+#include "../common/dconf-changeset.h"
 
 #include <gio/gio.h>
 
@@ -121,7 +121,7 @@ gboolean                dconf_engine_is_writable                        (DConfEn
 
 G_GNUC_INTERNAL
 GVariant *              dconf_engine_read                               (DConfEngine             *engine,
-                                                                         DConfChangesetList      *read_through,
+                                                                         GQueue                  *read_through,
                                                                          const gchar             *key);
 
 G_GNUC_INTERNAL