From ae7dcc28b2f99f87e723db209218b7e0aa63c544 Mon Sep 17 00:00:00 2001 From: Allison Ryan Lortie Date: Wed, 16 Dec 2015 14:29:50 +0000 Subject: 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-enums.h | 35 +++++++++++++++++++++++++++++++++++ common/dconf-error.c | 2 +- common/dconf-error.h | 35 ----------------------------------- common/dconf-paths.c | 2 +- engine/dconf-engine.c | 2 +- tests/engine.c | 2 +- 8 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 common/dconf-enums.h delete mode 100644 common/dconf-error.h 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 +#include #include #include #include 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-enums.h b/common/dconf-enums.h new file mode 100644 index 0000000..9f08211 --- /dev/null +++ b/common/dconf-enums.h @@ -0,0 +1,35 @@ +/* + * Copyright © 2013 Canonical 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, see . + * + * Author: Ryan Lortie + */ + +#ifndef __dconf_error_h__ +#define __dconf_error_h__ + +#include + +#define DCONF_ERROR (dconf_error_quark ()) +GQuark dconf_error_quark (void); + +typedef enum +{ + DCONF_ERROR_FAILED, + DCONF_ERROR_PATH, + DCONF_ERROR_NOT_WRITABLE +} DConfError; + +#endif /* __dconf_error_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-error.h b/common/dconf-error.h deleted file mode 100644 index 9f08211..0000000 --- a/common/dconf-error.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright © 2013 Canonical 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, see . - * - * Author: Ryan Lortie - */ - -#ifndef __dconf_error_h__ -#define __dconf_error_h__ - -#include - -#define DCONF_ERROR (dconf_error_quark ()) -GQuark dconf_error_quark (void); - -typedef enum -{ - DCONF_ERROR_FAILED, - DCONF_ERROR_PATH, - DCONF_ERROR_NOT_WRITABLE -} DConfError; - -#endif /* __dconf_error_h__ */ 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 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 -- cgit v1.2.1