From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 17 Dec 2006 13:36:35 +0000 (+0000)
Subject: kes  Add ENABLE_NLS (as suggested by Eric) to correct NLS problems.
X-Git-Tag: Release-2.0.0~105
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=76adc4f18c1e1a03d1b131404041f74afdc9052f;p=bacula%2Fbacula

kes  Add ENABLE_NLS (as suggested by Eric) to correct NLS problems.
     Remove NLS kludge from baconfig.h.  This fixes bug #729.
kes  Allow seeking on DVD.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3812 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in
index 00bb6056e5..6f43ac9577 100644
--- a/bacula/autoconf/config.h.in
+++ b/bacula/autoconf/config.h.in
@@ -676,3 +676,6 @@
 
 /* Define the LOCALEDIR if a translation */
 #undef LOCALEDIR
+
+/* Define if language support is enabled */
+#undef ENABLE_NLS
diff --git a/bacula/autoconf/config.h.in.save b/bacula/autoconf/config.h.in.save
index 00bb6056e5..6f43ac9577 100644
--- a/bacula/autoconf/config.h.in.save
+++ b/bacula/autoconf/config.h.in.save
@@ -676,3 +676,6 @@
 
 /* Define the LOCALEDIR if a translation */
 #undef LOCALEDIR
+
+/* Define if language support is enabled */
+#undef ENABLE_NLS
diff --git a/bacula/src/baconfig.h b/bacula/src/baconfig.h
index cec015ce57..4c7ae5ef31 100644
--- a/bacula/src/baconfig.h
+++ b/bacula/src/baconfig.h
@@ -83,7 +83,6 @@ void InitWinAPIWrapper();
 
 #define  OSDependentInit()    InitWinAPIWrapper()
 
-#undef ENABLE_NLS
 
 #if defined(BUILDING_DLL)
 #  define DLL_IMP_EXP   _declspec(dllexport)
diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 8c2153b0a4..e715d0edce 100644
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -443,7 +443,7 @@ static void job_monitor_watchdog(watchdog_t *self)
    Dmsg1(800, "job_monitor_watchdog %p called\n", self);
 
    foreach_jcr(jcr) {
-      bool cancel;
+      bool cancel = false;
 
       if (jcr->JobId == 0 || job_canceled(jcr)) {
          Dmsg2(800, "Skipping JCR=%p Job=%s\n", jcr, jcr->Job);
diff --git a/bacula/technotes-1.39 b/bacula/technotes-1.39
index f19fb87a8b..918d20244d 100644
--- a/bacula/technotes-1.39
+++ b/bacula/technotes-1.39
@@ -2,6 +2,8 @@
 
 General:
 17Dec06
+kes  Add ENABLE_NLS (as suggested by Eric) to correct NLS problems.
+     Remove NLS kludge from baconfig.h.  This fixes bug #729.
 kes  Allow seeking on DVD.
 kes  Add additional messages when Job canceled automatically for
      max run time or max start wait exceeded.  This fixes bug #621.