From f6dc3a65c5338e18e85269130ff9e04aac3677f9 Mon Sep 17 00:00:00 2001
From: David Hampton <hampton@employees.org>
Date: Tue, 17 Sep 2002 09:29:27 +0000
Subject: [PATCH] Fix a circular dependancy.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@7228 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/app-file/gncmod-app-file.c  | 5 +++++
 src/gnome-utils/Makefile.am     | 2 --
 src/gnome-utils/gnc-mdi-utils.c | 5 +----
 src/gnome-utils/gnc-mdi-utils.h | 2 ++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app-file/gncmod-app-file.c b/src/app-file/gncmod-app-file.c
index a5f312b9b2..9818403a5d 100644
--- a/src/app-file/gncmod-app-file.c
+++ b/src/app-file/gncmod-app-file.c
@@ -14,6 +14,7 @@
 #include "gnc-file-p.h"
 #include "gnc-file-history.h"
 #include "gnc-file-dialog.h"
+#include "gnc-mdi-utils.h"
 #include "gnc-module.h"
 #include "gnc-module-api.h"
 
@@ -72,6 +73,9 @@ libgncmod_app_file_LTX_gnc_module_init(int refcount)
     gnc_file_set_handlers (gnc_history_add_file,
                            gnc_history_get_last,
                            gnc_file_dialog);    
+
+    gnc_file_set_pct_handler (gnc_mdi_file_percentage);
+
     gnc_file_init ();
   }
 
@@ -84,6 +88,7 @@ libgncmod_app_file_LTX_gnc_module_end(int refcount)
   if(refcount == 0) 
   {
     gnc_file_set_handlers (NULL, NULL, NULL);
+    gnc_file_set_pct_handler (NULL);
   }
   return TRUE;
 }
diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am
index 8591ab4067..a7a305dcc1 100644
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@@ -6,7 +6,6 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/network-utils \
-  -I${top_srcdir}/src/app-file \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src \
   ${GUILE_INCS} \
@@ -86,7 +85,6 @@ libgncmod_gnome_utils_la_LIBADD = \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/calculation/libgncmod-calculation.la \
   ${top_builddir}/src/network-utils/libgncmod-network-utils.la \
-  ${top_builddir}/src/app-file/libgncmod-app-file.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${GUILE_LIBS} \
   ${GUPPI_LIBS} \
diff --git a/src/gnome-utils/gnc-mdi-utils.c b/src/gnome-utils/gnc-mdi-utils.c
index 030d60ea9f..72a172a769 100644
--- a/src/gnome-utils/gnc-mdi-utils.c
+++ b/src/gnome-utils/gnc-mdi-utils.c
@@ -28,7 +28,6 @@
 #include "dialog-utils.h"
 #include "global-options.h"
 #include "gnc-component-manager.h"
-#include "gnc-file.h"
 #include "gnc-html.h"
 #include "gnc-mdi-utils.h"
 #include "gnc-ui-util.h"
@@ -97,7 +96,7 @@ gnc_mdi_set_toolbar_visibility (gboolean visible)
   gnc_toolbar_visible = visible;
 }
 
-static void
+void
 gnc_mdi_file_percentage (const char *message, int percentage)
 {
   GtkWidget *app;
@@ -519,8 +518,6 @@ gnc_mdi_app_created_cb (GnomeMDI * mdi, GnomeApp * app, gpointer data)
   /* enable save and restore of menubar positions */
   gnome_app_enable_layout_config (app, TRUE);
 
-  gnc_file_set_pct_handler (gnc_mdi_file_percentage);
-
   /* flag the app as gnc mdi created */
   gtk_object_set_data (GTK_OBJECT (app), "gnc_mdi", mainwin);
 
diff --git a/src/gnome-utils/gnc-mdi-utils.h b/src/gnome-utils/gnc-mdi-utils.h
index 2748c90596..06b40cf7ef 100644
--- a/src/gnome-utils/gnc-mdi-utils.h
+++ b/src/gnome-utils/gnc-mdi-utils.h
@@ -118,6 +118,8 @@ void gnc_mdi_child_refresh (GNCMDIChildInfo *child);
 GNCMDIInfo * gnc_mdi_get_current (void);
 gboolean gnc_mdi_has_apps (void);
 
+void gnc_mdi_file_percentage (const char *message, int percentage);
+
 void gnc_app_set_title (GnomeApp *app);
 
 void gnc_mdi_save (GNCMDIInfo * gnc_mdi, char * filename);