X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fglabels-batch.c;h=4dd16e06c58ecede21fb3ac370cbc04ed1d267a1;hb=3943dd1240c9a6ef449fccfd52e7302baf9c5ae4;hp=3168f5245128593433681b3c7f1102b38f57675c;hpb=85bfb8a64853db59f56410670675015a8aa716e5;p=glabels

diff --git a/src/glabels-batch.c b/src/glabels-batch.c
index 3168f524..4dd16e06 100644
--- a/src/glabels-batch.c
+++ b/src/glabels-batch.c
@@ -24,8 +24,10 @@
 
 #include <math.h>
 
-#include <libglabels/libglabels.h>
+#include <libglabels.h>
 #include "merge-init.h"
+#include "template-history.h"
+#include "font-history.h"
 #include "xml-label.h"
 #include "print.h"
 #include "print-op.h"
@@ -88,7 +90,7 @@ main (int argc, char **argv)
 	gchar	          *utf8_filename;
         GError            *error = NULL;
 
-        bindtextdomain (GETTEXT_PACKAGE, GLABELS_LOCALEDIR);
+        bindtextdomain (GETTEXT_PACKAGE, GLABELS_LOCALE_DIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         textdomain (GETTEXT_PACKAGE);
 
@@ -129,6 +131,7 @@ main (int argc, char **argv)
         lgl_db_init ();
 	gl_prefs_init ();
 	gl_template_history_init ();
+	gl_font_history_init ();
 
         /* now print the files */
         for (p = file_list; p; p = p->next) {
@@ -142,7 +145,7 @@ main (int argc, char **argv)
                         if (input != NULL) {
                                 if (merge != NULL) {
                                         gl_merge_set_src(merge, input);
-                                        gl_label_set_merge(label, merge);
+                                        gl_label_set_merge(label, merge, FALSE);
                                 } else {
                                         fprintf ( stderr,
                                                   _("cannot perform document merge with glabels file %s\n"),