[dconf/wip/0-25-1: 2/10] common: rename dconf-error.h to dconf-enums.h



commit ae7dcc28b2f99f87e723db209218b7e0aa63c544
Author: Allison Ryan Lortie <desrt desrt ca>
Date:   Wed Dec 16 14:29:50 2015 +0000

    common: rename dconf-error.h to dconf-enums.h
    
    This will soon contain an extra enum.

 client/dconf.h                          |    2 +-
 common/Makefile.am                      |    2 +-
 common/{dconf-error.h => dconf-enums.h} |    0
 common/dconf-error.c                    |    2 +-
 common/dconf-paths.c                    |    2 +-
 engine/dconf-engine.c                   |    2 +-
 tests/engine.c                          |    2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/client/dconf.h b/client/dconf.h
index e75cb6d..77bda7c 100644
--- a/client/dconf.h
+++ b/client/dconf.h
@@ -20,7 +20,7 @@
 #ifndef __dconf_h__
 #define __dconf_h__
 
-#include <common/dconf-error.h>
+#include <common/dconf-enums.h>
 #include <common/dconf-paths.h>
 #include <common/dconf-changeset.h>
 #include <client/dconf-client.h>
diff --git a/common/Makefile.am b/common/Makefile.am
index 3435c0f..57f0f32 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.gtester
 dconfcommonincludedir = $(dconfincludedir)/common
 dconfcommoninclude_HEADERS = \
        dconf-changeset.h       \
-       dconf-error.h           \
+       dconf-enums.h           \
        dconf-paths.h
 
 noinst_LIBRARIES = libdconf-common.a libdconf-common-shared.a libdconf-common-hidden.a
diff --git a/common/dconf-error.h b/common/dconf-enums.h
similarity index 100%
rename from common/dconf-error.h
rename to common/dconf-enums.h
diff --git a/common/dconf-error.c b/common/dconf-error.c
index 19d1dc6..6339397 100644
--- a/common/dconf-error.c
+++ b/common/dconf-error.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#include "dconf-error.h"
+#include "dconf-enums.h"
 
 /**
  * SECTION:error
diff --git a/common/dconf-paths.c b/common/dconf-paths.c
index 7e4574d..047429d 100644
--- a/common/dconf-paths.c
+++ b/common/dconf-paths.c
@@ -22,7 +22,7 @@
 
 #include "dconf-paths.h"
 
-#include "dconf-error.h"
+#include "dconf-enums.h"
 
 /**
  * SECTION:paths
diff --git a/engine/dconf-engine.c b/engine/dconf-engine.c
index e51ec57..1b2770e 100644
--- a/engine/dconf-engine.c
+++ b/engine/dconf-engine.c
@@ -22,7 +22,7 @@
 #define _XOPEN_SOURCE 600
 #include "dconf-engine.h"
 
-#include "../common/dconf-error.h"
+#include "../common/dconf-enums.h"
 #include "../common/dconf-paths.h"
 #include "../gvdb/gvdb-reader.h"
 #include <string.h>
diff --git a/tests/engine.c b/tests/engine.c
index 09e89c2..60b4d5e 100644
--- a/tests/engine.c
+++ b/tests/engine.c
@@ -4,7 +4,7 @@
 
 #include "../engine/dconf-engine.h"
 #include "../engine/dconf-engine-profile.h"
-#include "../common/dconf-error.h"
+#include "../common/dconf-enums.h"
 #include "dconf-mock.h"
 
 #include <glib/gstdio.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]