summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-10-02 13:29:01 -0400
committerRyan Lortie <desrt@desrt.ca>2012-10-02 14:16:54 -0400
commit6b5201c34094109ffc253ed0b88d14d2d4795c36 (patch)
tree1de8e5e9647803a87058d6992653324cfa394a15 /engine
parentdeb563fb6bb47e1000c802da482676c04949fb61 (diff)
downloaddconf-6b5201c34094109ffc253ed0b88d14d2d4795c36.tar.gz
engine/: drop DConfChangesetList
It's really just a GQueue... https://bugzilla.gnome.org/show_bug.cgi?id=685316
Diffstat (limited to 'engine')
-rw-r--r--engine/Makefile.am1
-rw-r--r--engine/dconf-changeset-list.h38
-rw-r--r--engine/dconf-engine.c8
-rw-r--r--engine/dconf-engine.h4
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-changeset-list.h b/engine/dconf-changeset-list.h
deleted file mode 100644
index 68963b0..0000000
--- a/engine/dconf-changeset-list.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright © 2010 Codethink Limited
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the licence, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Ryan Lortie <desrt@desrt.ca>
- */
-
-#ifndef __dconf_changeset_list_h__
-#define __dconf_changeset_list_h__
-
-#include "../common/dconf-changeset.h"
-
-typedef struct _DConfChangesetList DConfChangesetList;
-
-struct _DConfChangesetList
-{
- GQueue queue;
-};
-
-DConfChangeset * dconf_changeset_list_new (void);
-
-void dconf_changeset_list_free (DConfChangesetList *changeset_list);
-
-#endif /* __dconf_changeset_list_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