output-item: Make label a part of every output_item.

[pspp] / src / output / page-setup-item.c

diff --git a/src/output/page-setup-item.c b/src/output/page-setup-item.c
index 45cf8c977f0d8c48456e67c6ebb9c678e2da35a6..7be1c2c43b66eeb36ec018f3aea12ff8938b588b 100644 (file)
--- a/src/output/page-setup-item.c
+++ b/src/output/page-setup-item.c
@@ -102,8 +102,10 @@ struct page_setup_item *
 page_setup_item_create (const struct page_setup *ps)
 {
   struct page_setup_item *item = xmalloc (sizeof *item);
-  output_item_init (&item->output_item, &page_setup_item_class);
-  item->page_setup = page_setup_clone (ps);
+  *item = (struct page_setup_item) {
+    .output_item = OUTPUT_ITEM_INITIALIZER (&page_setup_item_class),
+    .page_setup = page_setup_clone (ps),
+  };
   return item;
 }
 
@@ -115,6 +117,13 @@ page_setup_item_submit (struct page_setup_item *item)
   output_submit (&item->output_item);
 }
 
+static const char *
+page_setup_item_get_label (const struct output_item *output_item UNUSED)
+{
+  /* Not marked for translation: user should never see it. */
+  return "Page Setup";
+}
+
 static void
 page_setup_item_destroy (struct output_item *output_item)
 {
@@ -125,6 +134,6 @@ page_setup_item_destroy (struct output_item *output_item)
 
 const struct output_item_class page_setup_item_class =
   {
-    "page_setup",
+    page_setup_item_get_label,
     page_setup_item_destroy,
   };