[Gnucash-changes] Fix circular dependency jsled introduced.
Derek Atkins
warlord at cvs.gnucash.org
Sun Jun 13 15:26:33 EDT 2004
Log Message:
-----------
Fix circular dependency jsled introduced.
* configure.in: add support for gtkhtml-3.1, remove src/experimental
* src/Makefile.am: remove experimental subtree
* src/app-file/gncmod-app-file.c: don't need gnc-mdi-utils.h
* src/gnome/gnc-window.c: register the gnc-mdi progress handler
* src/gnome-utils/gnc-mdi-utils.[ch]: add a progress handler
that gets set by the gnc-window code (just like in gnc-file)
to remove a circular dependency.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
configure.in
gnucash/src:
Makefile.am
gnucash/src/app-file:
gncmod-app-file.c
gnucash/src/gnome:
gnc-window.c
gnucash/src/gnome-utils:
gnc-mdi-utils.c
gnc-mdi-utils.h
Revision Data
-------------
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.359.2.32
retrieving revision 1.359.2.33
diff -Lconfigure.in -Lconfigure.in -u -r1.359.2.32 -r1.359.2.33
--- configure.in
+++ configure.in
@@ -1120,11 +1120,6 @@
src/engine/Makefile
src/engine/test/Makefile
src/engine/test-core/Makefile
- src/experimental/Makefile
- src/experimental/cbb/Makefile
- src/experimental/cbb/cbb-engine/Makefile
- src/experimental/cgi-bin/Makefile
- src/experimental/gg/Makefile
src/gnc-module/Makefile
src/gnc-module/test/Makefile
src/gnc-module/test/mod-foo/Makefile
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.132
retrieving revision 1.1487.2.133
diff -LChangeLog -LChangeLog -u -r1.1487.2.132 -r1.1487.2.133
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,13 @@
+2004-06-13 Derek Atkins <derek at ihtfp.com>
+
+ * configure.in: add support for gtkhtml-3.1, remove src/experimental
+ * src/Makefile.am: remove experimental subtree
+ * src/app-file/gncmod-app-file.c: don't need gnc-mdi-utils.h
+ * src/gnome/gnc-window.c: register the gnc-mdi progress handler
+ * src/gnome-utils/gnc-mdi-utils.[ch]: add a progress handler
+ that gets set by the gnc-window code (just like in gnc-file)
+ to remove a circular dependency.
+
2004-05-31 Joshua Sled <jsled at asynchronous.org>
* src/report/report-gnome/gnc-plugin-page-report.c
Index: gnc-window.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/gnc-window.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/gnome/gnc-window.c -Lsrc/gnome/gnc-window.c -u -r1.1.2.3 -r1.1.2.4
--- src/gnome/gnc-window.c
+++ src/gnome/gnc-window.c
@@ -28,6 +28,7 @@
#include "gnc-trace.h"
#include "gnc-file.h"
+#include "gnc-mdi-utils.h"
#include "gnc-plugin-page.h"
#include "gnc-window.h"
@@ -57,6 +58,7 @@
g_type_interface_add_prerequisite (gnc_window_type, G_TYPE_OBJECT);
gnc_file_set_pct_handler (gnc_window_show_progress);
+ gnc_mdi_set_progress_handler (gnc_window_show_progress);
}
return gnc_window_type;
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/Makefile.am,v
retrieving revision 1.76.4.2
retrieving revision 1.76.4.3
diff -Lsrc/Makefile.am -Lsrc/Makefile.am -u -r1.76.4.2 -r1.76.4.3
--- src/Makefile.am
+++ src/Makefile.am
@@ -23,7 +23,6 @@
register \
gnome \
import-export \
- experimental \
business \
optional
Index: gncmod-app-file.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-file/gncmod-app-file.c,v
retrieving revision 1.8.4.2
retrieving revision 1.8.4.3
diff -Lsrc/app-file/gncmod-app-file.c -Lsrc/app-file/gncmod-app-file.c -u -r1.8.4.2 -r1.8.4.3
--- src/app-file/gncmod-app-file.c
+++ src/app-file/gncmod-app-file.c
@@ -13,7 +13,6 @@
#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"
Index: gnc-mdi-utils.h
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-mdi-utils.h,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -Lsrc/gnome-utils/gnc-mdi-utils.h -Lsrc/gnome-utils/gnc-mdi-utils.h -u -r1.8.4.1 -r1.8.4.2
--- src/gnome-utils/gnc-mdi-utils.h
+++ src/gnome-utils/gnc-mdi-utils.h
@@ -144,5 +144,7 @@
void gnc_mdi_show_statusbar (GNCMDIChildInfo *mc);
void gnc_mdi_show_summarybar (GNCMDIChildInfo *mc);
+typedef void (*GNCMDIProgressHandler) (const char *message, double percent);
+void gnc_mdi_set_progress_handler (GNCMDIProgressHandler mdi_progress_func);
#endif
Index: gnc-mdi-utils.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-mdi-utils.c,v
retrieving revision 1.18.4.11
retrieving revision 1.18.4.12
diff -Lsrc/gnome-utils/gnc-mdi-utils.c -Lsrc/gnome-utils/gnc-mdi-utils.c -u -r1.18.4.11 -r1.18.4.12
--- src/gnome-utils/gnc-mdi-utils.c
+++ src/gnome-utils/gnc-mdi-utils.c
@@ -36,7 +36,6 @@
#include "gnc-session.h"
#include "gnc-ui-util.h"
#include "gnc-ui.h"
-#include "gnc-window.h"
#define GNC_MDI_CM_CLASS "gnc-mdi"
@@ -47,6 +46,7 @@
static gboolean gnc_statusbar_visible = TRUE;
static gboolean gnc_summarybar_visible = TRUE;
+static GNCMDIProgressHandler mdi_progress_func = NULL;
/*
* These strings must match the dispatch enum listed at the start of
@@ -116,7 +116,8 @@
void
gnc_mdi_show_progress (const char *message, double percentage)
{
- gnc_window_show_progress( message, percentage );
+ if (mdi_progress_func)
+ mdi_progress_func( message, percentage );
}
typedef struct {
@@ -1311,3 +1312,9 @@
gnome_app_fill_toolbar (tb, tbinfo, NULL);
LEAVE(" ");
}
+
+void
+gnc_mdi_set_progress_handler (GNCMDIProgressHandler mdi_progress_func_in)
+{
+ mdi_progress_func = mdi_progress_func_in;
+}
More information about the gnucash-changes
mailing list