diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2012-02-05 15:46:36 -0500 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2012-02-05 15:46:36 -0500 |
| commit | e2d03370be7ff0f909fd13432892f7cbebde7a75 (patch) | |
| tree | 128f5eb82ea7ae698d8c301a04bd7c4cd52f1215 | |
| parent | ebc169999a8d06008509059fc332e6c847adaf75 (diff) | |
| download | dconf-e2d03370be7ff0f909fd13432892f7cbebde7a75.tar.gz | |
engine: drop some dead files
| -rw-r--r-- | client/engine.vapi | 2 | ||||
| -rw-r--r-- | engine/Makefile.am | 3 | ||||
| -rw-r--r-- | engine/dconf-engine.c | 4 | ||||
| -rw-r--r-- | engine/dconf-engine.h | 3 | ||||
| -rw-r--r-- | engine/dconf-readtype.h | 11 | ||||
| -rw-r--r-- | engine/dconf-resetlist.c | 1 | ||||
| -rw-r--r-- | engine/dconf-resetlist.h | 20 |
7 files changed, 1 insertions, 43 deletions
diff --git a/client/engine.vapi b/client/engine.vapi index d90063c..48dce55 100644 --- a/client/engine.vapi +++ b/client/engine.vapi @@ -10,7 +10,7 @@ namespace DConf { internal GLib.Variant? read_default (string key); internal GLib.Variant? read_no_default (string key); internal EngineMessage set_locked (string key, bool locked); - internal string[] list (string dir, void*junk = null); + internal string[] list (string dir); internal EngineMessage watch (string name); internal EngineMessage unwatch (string name); } diff --git a/engine/Makefile.am b/engine/Makefile.am index c67c91f..5228482 100644 --- a/engine/Makefile.am +++ b/engine/Makefile.am @@ -1,8 +1,5 @@ dconfinclude_HEADERS = \ - dconf-readtype.h \ - dconf-resetlist.h \ dconf-engine.h EXTRA_DIST = \ - dconf-resetlist.c \ dconf-engine.c diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c index c3b28ff..58856c3 100644 --- a/engine/dconf-engine.c +++ b/engine/dconf-engine.c @@ -637,14 +637,10 @@ dconf_engine_write_many (DConfEngine *engine, gchar ** dconf_engine_list (DConfEngine *engine, const gchar *dir, - DConfResetList *resets, gint *length) { gchar **list; - /* not yet supported */ - g_assert (resets == NULL); - g_mutex_lock (&engine->lock); dconf_engine_refresh (engine); diff --git a/engine/dconf-engine.h b/engine/dconf-engine.h index 5769cab..25de43d 100644 --- a/engine/dconf-engine.h +++ b/engine/dconf-engine.h @@ -22,8 +22,6 @@ #ifndef __dconf_engine_h__ #define __dconf_engine_h__ -#include <dconf-readtype.h> -#include <dconf-resetlist.h> #include <glib.h> typedef struct _DConfEngine DConfEngine; @@ -97,7 +95,6 @@ GVariant * dconf_engine_read_no_default (DConfEn G_GNUC_INTERNAL gchar ** dconf_engine_list (DConfEngine *engine, const gchar *path, - DConfResetList *resets, gint *length); G_GNUC_INTERNAL diff --git a/engine/dconf-readtype.h b/engine/dconf-readtype.h deleted file mode 100644 index 68c4f13..0000000 --- a/engine/dconf-readtype.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef __dconf_readtype_h__ -#define __dconf_readtype_h__ - -typedef enum -{ - DCONF_READ_NORMAL, - DCONF_READ_SET, - DCONF_READ_RESET -} DConfReadType; - -#endif /* __dconf_readtype_h__ */ diff --git a/engine/dconf-resetlist.c b/engine/dconf-resetlist.c deleted file mode 100644 index 8b13789..0000000 --- a/engine/dconf-resetlist.c +++ /dev/null @@ -1 +0,0 @@ - diff --git a/engine/dconf-resetlist.h b/engine/dconf-resetlist.h deleted file mode 100644 index ee9d13b..0000000 --- a/engine/dconf-resetlist.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __dconf_resetlist_h__ -#define __dconf_resetlist_h__ - -#include <glib.h> - -typedef struct -{ - gpointer opaque[8]; -} DConfResetList; - -void dconf_reset_list_init (DConfResetList *list, - const gchar *prefix, - const gchar * const *rels, - gsize n_rels); -void dconf_reset_list_add (DConfResetList *list, - const gchar *path); -void dconf_reset_list_clear (DConfResetList *list); - - -#endif /* __dconf_resetlist_h__ */ |