Revert r18869, "Move gnc-ui-util.[hc] and gnc-euro.[hc] from app-utils to engine"

Those files indeed belong better into app-utils; the app-utils defines
several not-yet-GUI parts of gnucash, like many conversions from and to
strings (more than those in these two files), so these files are well
suited in here.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18908 57a11ea4-9604-0410-9ed3-97b8803252fd

po/POTFILES.in

@@ -13,12 +13,14 @@ src/app-utils/gnc-druid-provider-desc-edge.c
 src/app-utils/gnc-druid-provider-desc-file.c
 src/app-utils/gnc-druid-provider-desc-multifile.c
 src/app-utils/gnc-druid-provider-file-cb.c
+src/app-utils/gnc-euro.c
 src/app-utils/gnc-exp-parser.c
 src/app-utils/gnc-gettext-util.c
 src/app-utils/gnc-helpers.c
 src/app-utils/gnc-help-utils.c
 src/app-utils/gncmod-app-utils.c
 src/app-utils/gnc-sx-instance-model.c
+src/app-utils/gnc-ui-util.c
 src/app-utils/guile-util.c
 src/app-utils/option-util.c
 src/backend/dbi/gnc-backend-dbi.c
@@ -163,14 +165,12 @@ src/engine/gnc-associate-account.c
 src/engine/gnc-budget.c
 src/engine/gnc-commodity.c
 src/engine/gnc-engine.c
-src/engine/gnc-euro.c
 src/engine/gnc-hooks.c
 src/engine/gnc-lot.c
 src/engine/gncmod-engine.c
 src/engine/gnc-pricedb.c
 src/engine/gnc-session.c
 src/engine/gnc-session-scm.c
-src/engine/gnc-ui-util.c
 src/engine/kvp-scm.c
 src/engine/Period.c
 src/engine/policy.c

src/app-utils/CMakeLists.txt

@@ -34,12 +34,14 @@ SET (app_utils_HEADERS
   gnc-druid-provider-desc-file.h
   gnc-druid-provider-desc-multifile.h
   gnc-druid-provider-file-cb.h
+  gnc-euro.h
   gnc-exp-parser.h
   gnc-gettext-util.h
   gnc-help-utils.h
   gnc-helpers.h
   gnc-sx-instance-model.h
   gnc-ui-common.h
+  gnc-ui-util.h
   guile-util.h
   option-util.h
 )
@@ -62,10 +64,12 @@ SET (app_utils_SOURCES
   gnc-druid-provider-desc-file.c
   gnc-druid-provider-desc-multifile.c
   gnc-druid-provider-file-cb.c
+  gnc-euro.c
   gnc-exp-parser.c
   gnc-gettext-util.c
   gnc-helpers.c
   gnc-sx-instance-model.c
+  gnc-ui-util.c
   gncmod-app-utils.c
   guile-util.c
   option-util.c

src/app-utils/Makefile.am

@@ -48,11 +48,13 @@ libgncmod_app_utils_la_SOURCES = \
   gnc-druid-provider-desc-file.c \
   gnc-druid-provider-desc-multifile.c \
   gnc-druid-provider-file-cb.c \
+  gnc-euro.c \
   gnc-exp-parser.c \
   gnc-gettext-util.c \
   gnc-helpers.c \
   gnc-sx-instance-model.c \
   gncmod-app-utils.c \
+  gnc-ui-util.c \
   guile-util.c \
   option-util.c
 
@@ -72,12 +74,14 @@ gncinclude_HEADERS = \
   gnc-druid-provider-desc-file.h \
   gnc-druid-provider-desc-multifile.h \
   gnc-druid-provider-file-cb.h \
+  gnc-euro.h \
   gnc-exp-parser.h \
   gnc-gettext-util.h \
   gnc-help-utils.h \
   gnc-helpers.h \
   gnc-sx-instance-model.h \
   gnc-ui-common.h \
+  gnc-ui-util.h \
   guile-util.h \
   option-util.h
 

src/app-utils/gnc-euro.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "engine/gnc-ui-util.h"
+#include "app-utils/gnc-ui-util.h"
 
 /* local structs */
 typedef struct

src/app-utils/gnc-ui-util.c

@@ -48,7 +48,7 @@
 #include "engine/Account.h"
 #include "engine/Transaction.h"
 #include "engine/gnc-engine.h"
-#include "engine/gnc-euro.h"
+#include "app-utils/gnc-euro.h"
 #include "engine/gnc-hooks.h"
 #include "engine/gnc-session.h"
 

src/core-utils/gnc-jalali.c

@@ -35,8 +35,6 @@
  */
 
 
-/* Copied from http://www.farsiweb.ir/wiki/Iranian_calendar */
-
 #include "gnc-jalali.h"
 
 

src/engine/CMakeLists.txt

@@ -3,7 +3,6 @@
 ADD_DEFINITIONS (-DG_LOG_DOMAIN=\"gnc.engine\")
 
 INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES (${GCONF2_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
 INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})
 INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS})
@@ -43,13 +42,11 @@ SET (libgncmod_engine_HEADERS
   gnc-budget.h
   gnc-commodity.h
   gnc-engine.h
-  gnc-euro.h
   gnc-event.h
   gnc-hooks.h
   gnc-pricedb.h
   gnc-session-scm.h
   gnc-session.h
-  gnc-ui-util.h
   gncObject.h
   kvp-scm.h
   policy.h
@@ -102,13 +99,11 @@ SET (libgncmod_engine_SOURCES
   gnc-budget.c
   gnc-commodity.c
   gnc-engine.c
-  gnc-euro.c
   gnc-hooks.c
   gnc-lot.c
   gnc-pricedb.c
   gnc-session-scm.c
   gnc-session.c
-  gnc-ui-util.c
   gncmod-engine.c
   kvp-scm.c
   engine-helpers.c

src/engine/Makefile.am

@@ -10,7 +10,6 @@ AM_CPPFLAGS = \
 	-I${top_srcdir}/src/gnc-module \
 	-I${top_srcdir}/src/libqof/qof \
 	${GLIB_CFLAGS} \
-	${GCONF_CFLAGS} \
 	${IGE_MAC_CFLAGS} \
 	${GUILE_INCS}
 
@@ -34,13 +33,11 @@ libgncmod_engine_la_SOURCES = \
   gnc-budget.c \
   gnc-commodity.c \
   gnc-engine.c \
-  gnc-euro.c \
   gnc-hooks.c \
   gnc-lot.c \
   gnc-pricedb.c \
   gnc-session.c \
   gnc-session-scm.c \
-  gnc-ui-util.c \
   gncmod-engine.c \
   swig-engine.c \
   kvp-scm.c \
@@ -78,13 +75,11 @@ gncinclude_HEADERS = \
   gnc-budget.h \
   gnc-commodity.h \
   gnc-engine.h \
-  gnc-euro.h \
   gnc-event.h \
   gnc-hooks.h \
   gnc-pricedb.h \
   gnc-session.h \
   gnc-session-scm.h \
-  gnc-ui-util.h \
   gncObject.h \
   kvp-scm.h \
   policy.h

src/gnc/Numeric.hpp

@@ -29,7 +29,7 @@ extern "C"
 {
 #include "qof.h"
 #include "gnc-date.h"
-#include "engine/gnc-ui-util.h"
+#include "app-utils/gnc-ui-util.h"
 }
 
 #include <QString>

src/gnc/main.cpp

@@ -43,7 +43,7 @@ extern "C"
 #include "engine/gnc-session.h"
 #include "engine/engine-helpers.h"
 #include "engine/gnc-engine.h"
-#include "engine/gnc-ui-util.h" // for gnc_ui_util_init()
+#include "app-utils/gnc-ui-util.h" // for gnc_ui_util_init()
 #include "swig-runtime.h"
 
 #include "backend/xml/gnc-backend-xml.h"