summaryrefslogtreecommitdiff
path: root/gsettings
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2012-07-10 09:31:07 -0400
committerRyan Lortie <desrt@desrt.ca>2012-07-10 09:31:07 -0400
commit7b4ad220b31fad9e36afe7e4099fdee9cceb01dd (patch)
tree34a38cd619ae6b040c076ea7291e68c9180df54d /gsettings
parent1f08d55b68740d917bbaf5c2c6ca3dcb81c396e3 (diff)
downloaddconf-7b4ad220b31fad9e36afe7e4099fdee9cceb01dd.tar.gz
gsettings/: remove the dconfcontext code
This is no longer needed with "fast" writes supported in the engine.
Diffstat (limited to 'gsettings')
-rw-r--r--gsettings/Makefile.am2
-rw-r--r--gsettings/dconfcontext.c33
-rw-r--r--gsettings/dconfcontext.h9
-rw-r--r--gsettings/dconfsettingsbackend.c2
4 files changed, 0 insertions, 46 deletions
diff --git a/gsettings/Makefile.am b/gsettings/Makefile.am
index 8b372ee..2a2be8f 100644
--- a/gsettings/Makefile.am
+++ b/gsettings/Makefile.am
@@ -13,8 +13,6 @@ libdconfsettings_so_LDADD = \
libdconfsettings_so_CFLAGS = $(gio_CFLAGS) -fPIC -DPIC
libdconfsettings_so_LDFLAGS = -shared
libdconfsettings_so_SOURCES = \
- dconfcontext.h \
- dconfcontext.c \
dconfsettingsbackend.c
uninstall-hook:
diff --git a/gsettings/dconfcontext.c b/gsettings/dconfcontext.c
deleted file mode 100644
index 5e11980..0000000
--- a/gsettings/dconfcontext.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "dconfcontext.h"
-
-static gpointer
-dconf_context_thread (gpointer data)
-{
- GMainContext *context = data;
- GMainLoop *loop;
-
- g_main_context_push_thread_default (context);
- loop = g_main_loop_new (context, FALSE);
- g_main_loop_run (loop);
-
- g_assert_not_reached ();
-}
-
-GMainContext *
-dconf_context_get (void)
-{
- static GMainContext *context;
- static gsize initialised;
-
- if (g_once_init_enter (&initialised))
- {
- GThread *thread;
-
- context = g_main_context_new ();
- thread = g_thread_new ("dconf worker", dconf_context_thread, context);
- g_thread_unref (thread);
- g_once_init_leave (&initialised, 1);
- }
-
- return context;
-}
diff --git a/gsettings/dconfcontext.h b/gsettings/dconfcontext.h
deleted file mode 100644
index 42d40a6..0000000
--- a/gsettings/dconfcontext.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef _dconfcontext_h_
-#define _dconfcontext_h_
-
-#include <glib.h>
-
-G_GNUC_INTERNAL
-GMainContext * dconf_context_get (void);
-
-#endif
diff --git a/gsettings/dconfsettingsbackend.c b/gsettings/dconfsettingsbackend.c
index 60458bd..32b2cab 100644
--- a/gsettings/dconfsettingsbackend.c
+++ b/gsettings/dconfsettingsbackend.c
@@ -26,8 +26,6 @@
#include <string.h>
-#include "dconfcontext.h"
-
typedef GSettingsBackendClass DConfSettingsBackendClass;
typedef struct