summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hergert <chergert@redhat.com>2023-03-16 16:22:25 -0700
committerChristian Hergert <chergert@redhat.com>2023-03-22 16:44:35 -0700
commit9b28ecb8dd50e95c6344d9e298f422e80068005d (patch)
treece74d0460efedbd29bf2d7083545a3ff8ae46647
parentaf21ae834387bd0e0ea7816ba99b06555b742491 (diff)
downloadlibpeas-9b28ecb8dd50e95c6344d9e298f422e80068005d.tar.gz
janitorial: rename <libpeas/peas.h> to <libpeas.h>
Doing the extra-subdirectory thing makes more sense when you have multiple libraries being installed. But since we dropped libpeas-gtk, we can simplify our header include to just <libpeas.h>.
-rw-r--r--libpeas/libpeas.h (renamed from libpeas/peas.h)8
-rw-r--r--libpeas/meson.build2
-rw-r--r--tests/libpeas/engine.c4
-rw-r--r--tests/libpeas/extension-c.c4
-rw-r--r--tests/libpeas/extension-set.c2
-rw-r--r--tests/libpeas/introspection/introspection-abstract.h2
-rw-r--r--tests/libpeas/introspection/introspection-base.h2
-rw-r--r--tests/libpeas/introspection/introspection-prerequisite.h2
-rw-r--r--tests/libpeas/plugin-info.c2
-rw-r--r--tests/libpeas/plugins/embedded/embedded-plugin.c2
-rw-r--r--tests/libpeas/plugins/embedded/embedded-plugin.h2
-rw-r--r--tests/libpeas/plugins/extension-c/extension-c-abstract.c2
-rw-r--r--tests/libpeas/plugins/extension-c/extension-c-plugin.c2
-rw-r--r--tests/libpeas/plugins/extension-c/extension-c-plugin.h2
-rw-r--r--tests/libpeas/testing/testing-extension.c2
-rw-r--r--tests/plugins/builtin/builtin-plugin.c2
-rw-r--r--tests/plugins/builtin/builtin-plugin.h2
-rw-r--r--tests/plugins/has-dep/has-dep-plugin.c2
-rw-r--r--tests/plugins/has-dep/has-dep-plugin.h2
-rw-r--r--tests/plugins/loadable/loadable-plugin.c2
-rw-r--r--tests/plugins/loadable/loadable-plugin.h2
-rw-r--r--tests/plugins/self-dep/self-dep-plugin.c2
-rw-r--r--tests/plugins/self-dep/self-dep-plugin.h2
23 files changed, 28 insertions, 28 deletions
diff --git a/libpeas/peas.h b/libpeas/libpeas.h
index 711cdd8..f3f6031 100644
--- a/libpeas/peas.h
+++ b/libpeas/libpeas.h
@@ -1,5 +1,5 @@
/*
- * peas.h
+ * libpeas.h
* This file is part of libpeas
*
* libpeas is free software; you can redistribute it and/or
@@ -17,8 +17,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef __PEAS_H__
-#define __PEAS_H__
+#ifndef __LIBPEAS_H__
+#define __LIBPEAS_H__
#include "peas-autocleanups.h"
#include "peas-engine.h"
@@ -30,4 +30,4 @@
#include "peas-version.h"
#include "peas-version-macros.h"
-#endif
+#endif /* __LIBPEAS_H__ */
diff --git a/libpeas/meson.build b/libpeas/meson.build
index 83ed349..9b716de 100644
--- a/libpeas/meson.build
+++ b/libpeas/meson.build
@@ -22,7 +22,7 @@ libpeas_public_h = files(
'peas-object-module.h',
'peas-plugin-info.h',
'peas-version-macros.h',
- 'peas.h',
+ 'libpeas.h',
)
libpeas_sources = files(
diff --git a/tests/libpeas/engine.c b/tests/libpeas/engine.c
index e6ba2cc..d8fa47c 100644
--- a/tests/libpeas/engine.c
+++ b/tests/libpeas/engine.c
@@ -25,9 +25,9 @@
#include <stdlib.h>
#include <glib.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
-#include "libpeas/peas-engine-priv.h"
+#include "peas-engine-priv.h"
#include "testing/testing.h"
diff --git a/tests/libpeas/extension-c.c b/tests/libpeas/extension-c.c
index 6693629..0dca6f8 100644
--- a/tests/libpeas/extension-c.c
+++ b/tests/libpeas/extension-c.c
@@ -23,8 +23,8 @@
#include <config.h>
#endif
-#include "libpeas/peas.h"
-#include "libpeas/peas-plugin-info-priv.h"
+#include "libpeas.h"
+#include "peas-plugin-info-priv.h"
#include "testing/testing-extension.h"
#include "introspection/introspection-base.h"
diff --git a/tests/libpeas/extension-set.c b/tests/libpeas/extension-set.c
index 2407db6..c4a2af5 100644
--- a/tests/libpeas/extension-set.c
+++ b/tests/libpeas/extension-set.c
@@ -27,7 +27,7 @@
#include <glib.h>
#include <glib-object.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "peas-activatable.h"
diff --git a/tests/libpeas/introspection/introspection-abstract.h b/tests/libpeas/introspection/introspection-abstract.h
index 2b02c8e..35025ec 100644
--- a/tests/libpeas/introspection/introspection-abstract.h
+++ b/tests/libpeas/introspection/introspection-abstract.h
@@ -22,7 +22,7 @@
#ifndef __INTROSPECTION_ABSTRACT_H__
#define __INTROSPECTION_ABSTRACT_H__
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "../../testing-util/peas-test-common.h"
diff --git a/tests/libpeas/introspection/introspection-base.h b/tests/libpeas/introspection/introspection-base.h
index 06b2ba3..e3f7832 100644
--- a/tests/libpeas/introspection/introspection-base.h
+++ b/tests/libpeas/introspection/introspection-base.h
@@ -22,7 +22,7 @@
#ifndef __INTROSPECTION_BASE_H__
#define __INTROSPECTION_BASE_H__
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "../../testing-util/peas-test-common.h"
diff --git a/tests/libpeas/introspection/introspection-prerequisite.h b/tests/libpeas/introspection/introspection-prerequisite.h
index f9f2c85..52bab44 100644
--- a/tests/libpeas/introspection/introspection-prerequisite.h
+++ b/tests/libpeas/introspection/introspection-prerequisite.h
@@ -22,7 +22,7 @@
#ifndef __INTROSPECTION_PREREQUISITE_H__
#define __INTROSPECTION_PREREQUISITE_H__
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "../../testing-util/peas-test-common.h"
diff --git a/tests/libpeas/plugin-info.c b/tests/libpeas/plugin-info.c
index d862876..eb19012 100644
--- a/tests/libpeas/plugin-info.c
+++ b/tests/libpeas/plugin-info.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <glib.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "testing/testing.h"
diff --git a/tests/libpeas/plugins/embedded/embedded-plugin.c b/tests/libpeas/plugins/embedded/embedded-plugin.c
index 7dcdd95..e5bc074 100644
--- a/tests/libpeas/plugins/embedded/embedded-plugin.c
+++ b/tests/libpeas/plugins/embedded/embedded-plugin.c
@@ -25,7 +25,7 @@
#include <glib-object.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "embedded-plugin.h"
diff --git a/tests/libpeas/plugins/embedded/embedded-plugin.h b/tests/libpeas/plugins/embedded/embedded-plugin.h
index 122c5a3..78142d0 100644
--- a/tests/libpeas/plugins/embedded/embedded-plugin.h
+++ b/tests/libpeas/plugins/embedded/embedded-plugin.h
@@ -22,7 +22,7 @@
#ifndef __TESTING_EMBEDDED_PLUGIN_H__
#define __TESTING_EMBEDDED_PLUGIN_H__
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "../../../testing-util/peas-test-common.h"
diff --git a/tests/libpeas/plugins/extension-c/extension-c-abstract.c b/tests/libpeas/plugins/extension-c/extension-c-abstract.c
index c6f767e..7c0a008 100644
--- a/tests/libpeas/plugins/extension-c/extension-c-abstract.c
+++ b/tests/libpeas/plugins/extension-c/extension-c-abstract.c
@@ -25,7 +25,7 @@
#include <glib-object.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "extension-c-abstract.h"
diff --git a/tests/libpeas/plugins/extension-c/extension-c-plugin.c b/tests/libpeas/plugins/extension-c/extension-c-plugin.c
index 6910cad..417c8fe 100644
--- a/tests/libpeas/plugins/extension-c/extension-c-plugin.c
+++ b/tests/libpeas/plugins/extension-c/extension-c-plugin.c
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <gmodule.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "introspection-abstract.h"
#include "introspection-base.h"
diff --git a/tests/libpeas/plugins/extension-c/extension-c-plugin.h b/tests/libpeas/plugins/extension-c/extension-c-plugin.h
index 934c7cb..5454709 100644
--- a/tests/libpeas/plugins/extension-c/extension-c-plugin.h
+++ b/tests/libpeas/plugins/extension-c/extension-c-plugin.h
@@ -22,7 +22,7 @@
#ifndef __EXTENSION_C_PLUGIN_H__
#define __EXTENSION_C_PLUGIN_H__
-#include <libpeas/peas.h>
+#include <libpeas.h>
G_BEGIN_DECLS
diff --git a/tests/libpeas/testing/testing-extension.c b/tests/libpeas/testing/testing-extension.c
index 64e9e99..907cdc5 100644
--- a/tests/libpeas/testing/testing-extension.c
+++ b/tests/libpeas/testing/testing-extension.c
@@ -28,7 +28,7 @@
#include <string.h>
#include <glib.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "testing.h"
#include "testing-extension.h"
diff --git a/tests/plugins/builtin/builtin-plugin.c b/tests/plugins/builtin/builtin-plugin.c
index b2fe598..bc25b86 100644
--- a/tests/plugins/builtin/builtin-plugin.c
+++ b/tests/plugins/builtin/builtin-plugin.c
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <gmodule.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "peas-activatable.h"
diff --git a/tests/plugins/builtin/builtin-plugin.h b/tests/plugins/builtin/builtin-plugin.h
index 1733141..8bfca23 100644
--- a/tests/plugins/builtin/builtin-plugin.h
+++ b/tests/plugins/builtin/builtin-plugin.h
@@ -22,7 +22,7 @@
#ifndef __TESTING_BUILTIN_PLUGIN_H__
#define __TESTING_BUILTIN_PLUGIN_H__
-#include <libpeas/peas.h>
+#include <libpeas.h>
G_BEGIN_DECLS
diff --git a/tests/plugins/has-dep/has-dep-plugin.c b/tests/plugins/has-dep/has-dep-plugin.c
index 3ddcb04..b06e321 100644
--- a/tests/plugins/has-dep/has-dep-plugin.c
+++ b/tests/plugins/has-dep/has-dep-plugin.c
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <gmodule.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "peas-activatable.h"
diff --git a/tests/plugins/has-dep/has-dep-plugin.h b/tests/plugins/has-dep/has-dep-plugin.h
index 72a051f..0d1918f 100644
--- a/tests/plugins/has-dep/has-dep-plugin.h
+++ b/tests/plugins/has-dep/has-dep-plugin.h
@@ -22,7 +22,7 @@
#ifndef __TESTING_HAS_DEP_PLUGIN_H__
#define __TESTING_HAS_DEP_PLUGIN_H__
-#include <libpeas/peas.h>
+#include <libpeas.h>
G_BEGIN_DECLS
diff --git a/tests/plugins/loadable/loadable-plugin.c b/tests/plugins/loadable/loadable-plugin.c
index 38e65fe..bc555ea 100644
--- a/tests/plugins/loadable/loadable-plugin.c
+++ b/tests/plugins/loadable/loadable-plugin.c
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <gmodule.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "peas-activatable.h"
diff --git a/tests/plugins/loadable/loadable-plugin.h b/tests/plugins/loadable/loadable-plugin.h
index 25ad58c..8470e73 100644
--- a/tests/plugins/loadable/loadable-plugin.h
+++ b/tests/plugins/loadable/loadable-plugin.h
@@ -22,7 +22,7 @@
#ifndef __TESTING_LOADABLE_PLUGIN_H__
#define __TESTING_LOADABLE_PLUGIN_H__
-#include <libpeas/peas.h>
+#include <libpeas.h>
G_BEGIN_DECLS
diff --git a/tests/plugins/self-dep/self-dep-plugin.c b/tests/plugins/self-dep/self-dep-plugin.c
index 0b0113c..e921d1d 100644
--- a/tests/plugins/self-dep/self-dep-plugin.c
+++ b/tests/plugins/self-dep/self-dep-plugin.c
@@ -27,7 +27,7 @@
#include <glib-object.h>
#include <gmodule.h>
-#include <libpeas/peas.h>
+#include <libpeas.h>
#include "peas-activatable.h"
diff --git a/tests/plugins/self-dep/self-dep-plugin.h b/tests/plugins/self-dep/self-dep-plugin.h
index e193033..8b47b22 100644
--- a/tests/plugins/self-dep/self-dep-plugin.h
+++ b/tests/plugins/self-dep/self-dep-plugin.h
@@ -22,7 +22,7 @@
#ifndef __TESTING_SELF_DEP_PLUGIN_H__
#define __TESTING_SELF_DEP_PLUGIN_H__
-#include <libpeas/peas.h>
+#include <libpeas.h>
G_BEGIN_DECLS