[Gnucash-changes] Fix a bunch of warnings and errors during startup.
Derek Atkins
warlord at cvs.gnucash.org
Wed May 5 13:11:01 EDT 2004
Log Message:
-----------
Fix a bunch of warnings and errors during startup.
* lib/egg/egg-menu-merge.c:
we don't have a "ui" so dont notify ourself when merging.
* src/gnome-utils/gnc-menu-extensions.scm:
Use empty strings instead of #f for menu items so we don't
cause problems later where we expect to get an actual string.
* src/report/report-gnome/report-gnome.scm:
Make sure we actually have a menu-path list!
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
ChangeLog
gnucash/lib/egg:
egg-menu-merge.c
gnucash/src/gnome-utils:
gnc-menu-extensions.scm
gnucash/src/report/report-gnome:
report-gnome.scm
Revision Data
-------------
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.123
retrieving revision 1.1487.2.124
diff -LChangeLog -LChangeLog -u -r1.1487.2.123 -r1.1487.2.124
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,13 @@
+2004-05-05 Derek Atkins <derek at ihtfp.com>
+
+ * lib/egg/egg-menu-merge.c:
+ we don't have a "ui" so dont notify ourself when merging.
+ * src/gnome-utils/gnc-menu-extensions.scm:
+ Use empty strings instead of #f for menu items so we don't
+ cause problems later where we expect to get an actual string.
+ * src/report/report-gnome/report-gnome.scm:
+ Make sure we actually have a menu-path list!
+
2004-05-02 David Hampton <hampton at employees.org>
* various files: Merge in changes to HEAD from 2004-03-03
Index: egg-menu-merge.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/lib/egg/Attic/egg-menu-merge.c,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -Llib/egg/egg-menu-merge.c -Llib/egg/egg-menu-merge.c -u -r1.1.2.8 -r1.1.2.9
--- lib/egg/egg-menu-merge.c
+++ lib/egg/egg-menu-merge.c
@@ -907,7 +907,7 @@
egg_menu_merge_queue_update (self);
- g_object_notify (G_OBJECT (self), "ui");
+ //g_object_notify (G_OBJECT (self), "ui");
}
Index: gnc-menu-extensions.scm
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/gnc-menu-extensions.scm,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -Lsrc/gnome-utils/gnc-menu-extensions.scm -Lsrc/gnome-utils/gnc-menu-extensions.scm -u -r1.4 -r1.4.4.1
--- src/gnome-utils/gnc-menu-extensions.scm
+++ src/gnome-utils/gnc-menu-extensions.scm
@@ -49,10 +49,10 @@
(gnc:make-extension 'menu-item name documentation-string path script))
(define (gnc:make-menu name path)
- (gnc:make-extension 'menu name #f path #f))
+ (gnc:make-extension 'menu name "" path #f))
(define (gnc:make-separator path)
- (gnc:make-extension 'separator #f #f path #f))
+ (gnc:make-extension 'separator "" "" path #f))
(define gnc:*add-extension-hook*
(gnc:hook-define
Index: report-gnome.scm
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/report-gnome/report-gnome.scm,v
retrieving revision 1.9.4.2
retrieving revision 1.9.4.3
diff -Lsrc/report/report-gnome/report-gnome.scm -Lsrc/report/report-gnome/report-gnome.scm -u -r1.9.4.2 -r1.9.4.3
--- src/report/report-gnome/report-gnome.scm
+++ src/report/report-gnome/report-gnome.scm
@@ -56,6 +56,9 @@
;;(set! menu-path
;; (append menu-path '(""))))
+ (if (not menu-path)
+ (set! menu-path '()))
+
(set! menu-path (append (list gnc:window-name-main gnc:menuname-reports) menu-path))
(if (not menu-tip)
More information about the Gnucash-changes
mailing list