diff --git a/src/app-utils/app-utils.scm b/src/app-utils/app-utils.scm index 7452f5088b..f292a61db6 100644 --- a/src/app-utils/app-utils.scm +++ b/src/app-utils/app-utils.scm @@ -233,11 +233,6 @@ (export gnc:hook-run-danglers) ;; from hooks.scm (re-export gnc:hook-add-dangler) (re-export gnc:hook-remove-dangler) -(re-export gnc:*startup-hook*) -(re-export gnc:*shutdown-hook*) -(re-export gnc:*ui-startup-hook*) -(re-export gnc:*ui-post-startup-hook*) -(re-export gnc:*ui-shutdown-hook*) (re-export gnc:*book-opened-hook*) (re-export gnc:*new-book-hook*) (re-export gnc:*book-closed-hook*) diff --git a/src/core-utils/gw-core-utils-spec.scm b/src/core-utils/gw-core-utils-spec.scm index 05982855e2..b8381f7329 100644 --- a/src/core-utils/gw-core-utils-spec.scm +++ b/src/core-utils/gw-core-utils-spec.scm @@ -24,7 +24,8 @@ ws (lambda (wrapset client-wrapset) (list - "#include \n"))) + "#include \n" + "#include \n"))) (gw:wrap-function ws @@ -34,4 +35,13 @@ '((( caller-owned) section) (( caller-owned) name)) "Get a boolean value from gconf.") + + (gw:wrap-function + ws + 'gnc:debugging? + ' + "gnc_is_debugging" + '() + "Is debugging mode on?") + ) diff --git a/src/engine/gw-engine-spec.scm b/src/engine/gw-engine-spec.scm index 432be1880e..ae2bf3cfc1 100644 --- a/src/engine/gw-engine-spec.scm +++ b/src/engine/gw-engine-spec.scm @@ -2621,24 +2621,12 @@ the timepair representing midday on that day") "Run the danglers on a hook.") ; Now wrap all the 'known' hooks -(gw:wrap-value ws 'gnc:*startup-hook* - '( callee-owned) "HOOK_STARTUP") -(gw:wrap-value ws 'gnc:*shutdown-hook* - '( callee-owned) "HOOK_SHUTDOWN") -(gw:wrap-value ws 'gnc:*ui-startup-hook* - '( callee-owned) "HOOK_UI_STARTUP") -(gw:wrap-value ws 'gnc:*ui-post-startup-hook* - '( callee-owned) "HOOK_UI_POST_STARTUP") -(gw:wrap-value ws 'gnc:*ui-shutdown-hook* - '( callee-owned) "HOOK_UI_SHUTDOWN") (gw:wrap-value ws 'gnc:*new-book-hook* '( callee-owned) "HOOK_NEW_BOOK") (gw:wrap-value ws 'gnc:*report-hook* '( callee-owned) "HOOK_REPORT") (gw:wrap-value ws 'gnc:*save-options-hook* '( callee-owned) "HOOK_SAVE_OPTIONS") -(gw:wrap-value ws 'gnc:*add-extension-hook* - '( callee-owned) "HOOK_ADD_EXTENSION") (gw:wrap-value ws 'gnc:*book-opened-hook* '( callee-owned) "HOOK_BOOK_OPENED") (gw:wrap-value ws 'gnc:*book-closed-hook* diff --git a/src/gnome-utils/gnc-menu-extensions.scm b/src/gnome-utils/gnc-menu-extensions.scm index ee7707c28f..9dd6a9a242 100644 --- a/src/gnome-utils/gnc-menu-extensions.scm +++ b/src/gnome-utils/gnc-menu-extensions.scm @@ -53,13 +53,3 @@ (define (gnc:make-separator path) (gnc:make-extension 'separator "" "" path #f)) - -(define (gnc:extensions-menu-setup) - (define menu (gnc:make-menu (N_ "Extensions") (list "_Tools"))) - (gnc:add-extension menu) - (gnc:hook-run-danglers gnc:*add-extension-hook*) - #f) - -(if (gnc:debugging?) - (gnc:hook-add-dangler gnc:*ui-startup-hook* - gnc:extensions-menu-setup)) diff --git a/src/gnome-utils/gnome-utils.scm b/src/gnome-utils/gnome-utils.scm index 28c6e5d6aa..7d512f5cc9 100644 --- a/src/gnome-utils/gnome-utils.scm +++ b/src/gnome-utils/gnome-utils.scm @@ -15,7 +15,6 @@ (export gnc:make-menu-item) (export gnc:make-menu) (export gnc:make-separator) -(re-export gnc:*add-extension-hook*) (export gnc:kvp-option-dialog) diff --git a/src/scm/command-line.scm b/src/scm/command-line.scm index 885ffe36ed..b3eb8660f4 100644 --- a/src/scm/command-line.scm +++ b/src/scm/command-line.scm @@ -22,8 +22,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Configuration variables -(define gnc:*loglevel* #f) - (define gnc:*doc-path* #f) (define (gnc:expand-path new-list current-list default-generator) @@ -67,23 +65,6 @@ ;; We use a function so we don't do this at file load time. ;; Convert the temporary startup value into a config var. - (let ((current-value gnc:*debugging?*)) - (set! - gnc:*debugging?* - (gnc:make-config-var - (N_ "Enable debugging code.") - (lambda (var value) (if (boolean? value) (list value) #f)) - eq? - #f)) - (gnc:config-var-value-set! gnc:*debugging?* #f current-value)) - - (set! gnc:*loglevel* - (gnc:make-config-var - (N_ "Logging level from 0 (least logging) to 5 (most logging).") - (lambda (var value) (if (exact? value) (list value) #f)) - eq? - #f)) - (set! gnc:*doc-path* (gnc:make-path-config-var (N_ "A list of directories (strings) indicating where to look for html and parsed-html files. \ @@ -111,20 +92,6 @@ the current value of the path.") ;; for now since it doesn't depend on running any code. (define gnc:*arg-defs* (list - (list "debug" - 'boolean - (lambda (val) - (gnc:config-var-value-set! gnc:*debugging?* #f val)) - #f - (N_ "Enable debugging mode")) - - (list "loglevel" - 'integer - (lambda (val) - (gnc:config-var-value-set! gnc:*loglevel* #f val)) - "LOGLEVEL" - (N_ "Set the logging level from 0 (least) to 6 (most)")) - (list "doc-path" 'string (lambda (val) diff --git a/src/scm/main.scm b/src/scm/main.scm index a164731792..e47e848fa4 100644 --- a/src/scm/main.scm +++ b/src/scm/main.scm @@ -45,7 +45,6 @@ ;; from main.scm (export gnc:version) -(export gnc:debugging?) (export gnc:warn) (export gnc:error) (export gnc:msg) @@ -89,15 +88,6 @@ ;;(use-modules (ice-9 statprof)) -;; These will be converted to config vars later (see command-line.scm) -(define gnc:*debugging?* (if (getenv "GNC_DEBUG") #t #f)) - -;; Function to get debugging -(define (gnc:debugging?) - (if (boolean? gnc:*debugging?*) - gnc:*debugging?* - (gnc:config-var-value-get gnc:*debugging?*))) - (define (gnc:setup-debugging) (if (gnc:debugging?) (debug-enable 'backtrace)))