[gegl] json: make bundleable
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] json: make bundleable
- Date: Tue, 20 Sep 2016 23:02:32 +0000 (UTC)
commit 12c58f4e5163be75face61eab3c8d0d1dfb79e50
Author: Øyvind Kolås <pippin gimp org>
Date: Tue Sep 20 20:41:22 2016 +0200
json: make bundleable
operations/core/json.c | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/operations/core/json.c b/operations/core/json.c
index 9f319b0..bbf0ce1 100644
--- a/operations/core/json.c
+++ b/operations/core/json.c
@@ -35,6 +35,8 @@ Installed to, and loaded at runtime from
dropshadow a good initial testcase?
*/
+//#define GEGL_OP_NAME json
+
#include <json-glib/json-glib.h>
#include <gegl-plugin.h>
@@ -605,6 +607,14 @@ static const GeglModuleInfo modinfo =
gboolean gegl_module_register (GTypeModule *module);
const GeglModuleInfo * gegl_module_query (GTypeModule *module);
+
+#ifdef GEGL_OP_BUNDLE
+
+G_MODULE_EXPORT void
+gegl_op_json_register_type (GTypeModule *module)
+{
+#else
+
G_MODULE_EXPORT const GeglModuleInfo *
gegl_module_query (GTypeModule *module)
{
@@ -614,12 +624,15 @@ gegl_module_query (GTypeModule *module)
G_MODULE_EXPORT gboolean
gegl_module_register (GTypeModule *module)
{
+#endif
/* Ensure the module, or shared libs it pulls in is not unloaded
* This because when GTypes are registered (like for json-glib),
* all referenced data must stay in memory until process exit */
g_module_make_resident (GEGL_MODULE (module)->module);
json_register_operations (module);
-
+#ifndef GEGL_OP_BUNDLE
return TRUE;
+#endif
}
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]