Add place-holder field to all empty private structures

Fixes glabels bug #2981895.  This is a work-around for glib bug #615379.  For
objects with no private data, add a place-holder field so that the private
structure is not of zero length which causes g_new0() to crash in glib
2.24.0.

diff --git a/src/view-barcode.c b/src/view-barcode.c
index 522d334c599e85b6df66fbe10a2126d057e7d5b6..02b8f9fe5e1ea2925dd4a55c14aa67ce9d960ad6 100644 (file)
--- a/src/view-barcode.c
+++ b/src/view-barcode.c
@@ -46,6 +46,7 @@
 /*========================================================*/
 
 struct _glViewBarcodePrivate {
+        int place_holder; /* Place holder for future private data. */
 };
 
 /*========================================================*/

diff --git a/src/view-box.c b/src/view-box.c
index 42f39803ac9fbd4bd39f109cc5476a35c4dbc06a..4d0941f2a80f89bd0ef57f0bb528ac43f1f62120 100644 (file)
--- a/src/view-box.c
+++ b/src/view-box.c
@@ -47,6 +47,7 @@
 /*========================================================*/
 
 struct _glViewBoxPrivate {
+        int place_holder; /* Place holder for future private data. */
 };
 
 /*========================================================*/

diff --git a/src/view-ellipse.c b/src/view-ellipse.c
index 854747041d5df7dd5f9ab9da25afdeb0932dd6f9..6d86b5aec59bbdbe3eae2bdec8185dc1dee1dd31 100644 (file)
--- a/src/view-ellipse.c
+++ b/src/view-ellipse.c
@@ -48,6 +48,7 @@
 /*========================================================*/
 
 struct _glViewEllipsePrivate {
+        int place_holder; /* Place holder for future private data. */
 };
 
 /*========================================================*/

diff --git a/src/view-image.c b/src/view-image.c
index 7612284d7564d050c7a3750191af62f8a1b4b362..b546baf55fb6c36cfca779abebc31c19b537d31f 100644 (file)
--- a/src/view-image.c
+++ b/src/view-image.c
@@ -47,6 +47,7 @@
 /*========================================================*/
 
 struct _glViewImagePrivate {
+        int place_holder; /* Place holder for future private data. */
 };
 
 /*========================================================*/

diff --git a/src/view-line.c b/src/view-line.c
index 12f29a4105ddeb9e5458d9f8924a05333d956b8e..8c3996588d0e9275ba89aae5246c83b2e5be7ceb 100644 (file)
--- a/src/view-line.c
+++ b/src/view-line.c
@@ -47,6 +47,7 @@
 /*========================================================*/
 
 struct _glViewLinePrivate {
+        int place_holder; /* Place holder for future private data. */
 };
 
 /*========================================================*/

diff --git a/src/view-text.c b/src/view-text.c
index ca930129b54083540776740fcfe8f7799e80889e..527c307dabaabe8fd7859e5c5e852769c6cec3ff 100644 (file)
--- a/src/view-text.c
+++ b/src/view-text.c
@@ -46,6 +46,7 @@
 /*========================================================*/
 
 struct _glViewTextPrivate {
+        int place_holder; /* Place holder for future private data. */
 };
 
 /*========================================================*/