2007-10-08 Jim Evins <evins@snaught.com>

	* 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

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index fc92273bd305848db5e79732e2da48523a687cbf..e0dac1404a19d9cd0ccd8b50342795b27705ffc4 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-08  Jim Evins  <evins@snaught.com>
+
+       * libglabels/template.c:
+       * libglabels/xml-template.c:
+       * src/template-designer.c:
+               Missed some symbols with libglabels API work.
+
 2007-10-01  Jim Evins  <evins@snaught.com>
 
        * docs/libglabels/libglabels-decl-list.txt:

diff --git a/glabels2/libglabels/template.c b/glabels2/libglabels/template.c
index 16c972e5ebf555431ddf2d84c37af29d1247c9b0..a628b4f5236936bde487008426390510e714a11e 100644 (file)
--- 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 35cd67713434dc8f14fd4c993ff02fad1dd0fc19..3ce412229f051be6d37f29764a82b58d35ef373d 100644 (file)
--- 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 708fa5b2033e75c6a2308ef1ec38cf7c764d3cc8..a4b3bb046223fc5cc702db0279426a9acdafb333 100644 (file)
--- 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);