From bd566146fa954271ebcb3536251c5c521f0a9e87 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Mon, 8 Oct 2007 04:55:47 +0000 Subject: [PATCH] 2007-10-08 Jim Evins * libglabels/template.c: * libglabels/xml-template.c: * src/template-designer.c: Missed some symbols with libglabels API work git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@676 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels2/ChangeLog | 7 +++++++ glabels2/libglabels/template.c | 8 ++++---- glabels2/libglabels/xml-template.c | 10 +++++----- glabels2/src/template-designer.c | 30 +++++++++++++++--------------- 4 files changed, 31 insertions(+), 24 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index fc92273b..e0dac140 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,10 @@ +2007-10-08 Jim Evins + + * libglabels/template.c: + * libglabels/xml-template.c: + * src/template-designer.c: + Missed some symbols with libglabels API work. + 2007-10-01 Jim Evins * docs/libglabels/libglabels-decl-list.txt: diff --git a/glabels2/libglabels/template.c b/glabels2/libglabels/template.c index 16c972e5..a628b4f5 100644 --- a/glabels2/libglabels/template.c +++ b/glabels2/libglabels/template.c @@ -1053,14 +1053,14 @@ lgl_template_frame_dup (const lglTemplateFrame *orig_frame) layout = (lglTemplateLayout *)p->data; - lgl_template_add_layout (frame, lgl_template_layout_dup (layout)); + lgl_template_frame_add_layout (frame, lgl_template_layout_dup (layout)); } for ( p=orig_frame->all.markups; p != NULL; p=p->next ) { markup = (lglTemplateMarkup *)p->data; - lgl_template_add_markup (frame, lgl_template_markup_dup (markup)); + lgl_template_frame_add_markup (frame, lgl_template_markup_dup (markup)); } return frame; @@ -1219,9 +1219,9 @@ template_full_page (const gchar *page_size) 0.0); lgl_template_add_frame (template, frame); - lgl_template_add_layout (frame, lgl_template_layout_new (1, 1, 0., 0., 0., 0.)); + lgl_template_frame_add_layout (frame, lgl_template_layout_new (1, 1, 0., 0., 0., 0.)); - lgl_template_add_markup (frame, lgl_template_markup_margin_new (9.0)); + lgl_template_frame_add_markup (frame, lgl_template_markup_margin_new (9.0)); g_free (name); name = NULL; diff --git a/glabels2/libglabels/xml-template.c b/glabels2/libglabels/xml-template.c index 35cd6771..3ce41222 100644 --- a/glabels2/libglabels/xml-template.c +++ b/glabels2/libglabels/xml-template.c @@ -448,7 +448,7 @@ xml_parse_layout_node (xmlNodePtr layout_node, dx = lgl_xml_get_prop_length (layout_node, "dx", 0); dy = lgl_xml_get_prop_length (layout_node, "dy", 0); - lgl_template_add_layout (frame, lgl_template_layout_new (nx, ny, x0, y0, dx, dy)); + lgl_template_frame_add_layout (frame, lgl_template_layout_new (nx, ny, x0, y0, dx, dy)); for (node = layout_node->xmlChildrenNode; node != NULL; node = node->next) { @@ -473,7 +473,7 @@ xml_parse_markup_margin_node (xmlNodePtr markup_node, size = lgl_xml_get_prop_length (markup_node, "size", 0); - lgl_template_add_markup (frame, lgl_template_markup_margin_new (size)); + lgl_template_frame_add_markup (frame, lgl_template_markup_margin_new (size)); for (node = markup_node->xmlChildrenNode; node != NULL; node = node->next) { @@ -501,7 +501,7 @@ xml_parse_markup_line_node (xmlNodePtr markup_node, x2 = lgl_xml_get_prop_length (markup_node, "x2", 0); y2 = lgl_xml_get_prop_length (markup_node, "y2", 0); - lgl_template_add_markup (frame, lgl_template_markup_line_new (x1, y1, x2, y2)); + lgl_template_frame_add_markup (frame, lgl_template_markup_line_new (x1, y1, x2, y2)); for (node = markup_node->xmlChildrenNode; node != NULL; node = node->next) { @@ -528,7 +528,7 @@ xml_parse_markup_circle_node (xmlNodePtr markup_node, y0 = lgl_xml_get_prop_length (markup_node, "y0", 0); r = lgl_xml_get_prop_length (markup_node, "radius", 0); - lgl_template_add_markup (frame, lgl_template_markup_circle_new (x0, y0, r)); + lgl_template_frame_add_markup (frame, lgl_template_markup_circle_new (x0, y0, r)); for (node = markup_node->xmlChildrenNode; node != NULL; node = node->next) { @@ -557,7 +557,7 @@ xml_parse_markup_rect_node (xmlNodePtr markup_node, h = lgl_xml_get_prop_length (markup_node, "h", 0); r = lgl_xml_get_prop_length (markup_node, "r", 0); - lgl_template_add_markup (frame, lgl_template_markup_rect_new (x1, y1, w, h, r)); + lgl_template_frame_add_markup (frame, lgl_template_markup_rect_new (x1, y1, w, h, r)); for (node = markup_node->xmlChildrenNode; node != NULL; node = node->next) { diff --git a/glabels2/src/template-designer.c b/glabels2/src/template-designer.c index 708fa5b2..a4b3bb04 100644 --- a/glabels2/src/template-designer.c +++ b/glabels2/src/template-designer.c @@ -1691,22 +1691,22 @@ build_template (glTemplateDesigner *dialog) } lgl_template_add_frame (template, frame); - lgl_template_add_markup (frame, - lgl_template_markup_margin_new (margin/upp)); - - lgl_template_add_layout (frame, - lgl_template_layout_new (nx_1, ny_1, - x0_1/upp, - y0_1/upp, - dx_1/upp, - dy_1/upp)); + lgl_template_frame_add_markup (frame, + lgl_template_markup_margin_new (margin/upp)); + + lgl_template_frame_add_layout (frame, + lgl_template_layout_new (nx_1, ny_1, + x0_1/upp, + y0_1/upp, + dx_1/upp, + dy_1/upp)); if (nlayouts > 1) { - lgl_template_add_layout (frame, - lgl_template_layout_new (nx_2, ny_2, - x0_2/upp, - y0_2/upp, - dx_2/upp, - dy_2/upp)); + lgl_template_frame_add_layout (frame, + lgl_template_layout_new (nx_2, ny_2, + x0_2/upp, + y0_2/upp, + dx_2/upp, + dy_2/upp)); } g_free (brand); -- 2.39.5