[Gnucash-changes] Eliminate double call of some hooks.

[David Hampton]

Log Message:
-----------
Eliminate double call of some hooks.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash/src/app-file:
        gnc-file.c
    gnucash/src/gnome:
        dialog-new-user.c
        top-level.c

Revision Data
-------------
Index: gnc-file.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-file/gnc-file.c,v
retrieving revision 1.25.4.16
retrieving revision 1.25.4.17
diff -Lsrc/app-file/gnc-file.c -Lsrc/app-file/gnc-file.c -u -r1.25.4.16 -r1.25.4.17
--- src/app-file/gnc-file.c
+++ src/app-file/gnc-file.c
@@ -349,13 +349,7 @@
 static void
 gnc_book_opened (void)
 {
-  QofSession *session = qof_session_get_current_session();
-  scm_call_2 (scm_c_eval_string("gnc:hook-run-danglers"),
-              scm_c_eval_string("gnc:*book-opened-hook*"),
-              (session ? 
-               gw_wcp_assimilate_ptr (session, scm_c_eval_string("<gnc:Session*>")) :
-               SCM_BOOL_F));
-  gnc_hook_run(HOOK_BOOK_OPENED, session);
+  gnc_hook_run(HOOK_BOOK_OPENED, qof_session_get_current_session());
 }
 
 void
@@ -375,11 +369,6 @@
   gnc_engine_suspend_events ();
   
   qof_session_call_close_hooks(session);
-  scm_call_2(scm_c_eval_string("gnc:hook-run-danglers"),
-             scm_c_eval_string("gnc:*book-closed-hook*"),
-             (session ?
-              gw_wcp_assimilate_ptr (session, scm_c_eval_string("<gnc:Session*>")) :
-              SCM_BOOL_F));
   gnc_hook_run(HOOK_BOOK_CLOSED, session);
 
   gnc_close_gui_component_by_session (session);
@@ -390,8 +379,6 @@
   /* start a new book */
   qof_session_get_current_session ();
 
-  scm_call_1(scm_c_eval_string("gnc:hook-run-danglers"),
-             scm_c_eval_string("gnc:*new-book-hook*"));
   gnc_hook_run(HOOK_NEW_BOOK, NULL);
 
   gnc_book_opened ();
@@ -469,12 +456,6 @@
   /* -- this code is almost identical in FileOpen and FileSaveAs -- */
   current_session  = qof_session_get_current_session();
   qof_session_call_close_hooks(current_session);
-  scm_call_2(scm_c_eval_string("gnc:hook-run-danglers"),
-             scm_c_eval_string("gnc:*book-closed-hook*"),
-             (current_session ?
-              gw_wcp_assimilate_ptr (current_session,
-                                     scm_c_eval_string("<gnc:Session*>")) :
-              SCM_BOOL_F));
   gnc_hook_run(HOOK_BOOK_CLOSED, current_session);
   xaccLogDisable();
   qof_session_destroy (current_session);
@@ -965,11 +946,6 @@
   gnc_engine_suspend_events ();
 
   qof_session_call_close_hooks(session);
-  scm_call_2(scm_c_eval_string("gnc:hook-run-danglers"),
-             scm_c_eval_string("gnc:*book-closed-hook*"),
-             (session ?
-              gw_wcp_assimilate_ptr (session, scm_c_eval_string("<gnc:Session*>")) :
-              SCM_BOOL_F));
   gnc_hook_run(HOOK_BOOK_CLOSED, session);
   
   xaccLogDisable();
Index: dialog-new-user.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/dialog-new-user.c,v
retrieving revision 1.4.4.11
retrieving revision 1.4.4.12
diff -Lsrc/gnome/dialog-new-user.c -Lsrc/gnome/dialog-new-user.c -u -r1.4.4.11 -r1.4.4.12
--- src/gnome/dialog-new-user.c
+++ src/gnome/dialog-new-user.c
@@ -136,6 +136,5 @@
 void
 gncp_new_user_finish (void)
 {
-  scm_c_eval_string("(gnc:hook-run-danglers gnc:*book-opened-hook* #f)");
   gnc_hook_run(HOOK_BOOK_OPENED, NULL);
 }
Index: top-level.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/top-level.c,v
retrieving revision 1.140.4.21
retrieving revision 1.140.4.22
diff -Lsrc/gnome/top-level.c -Lsrc/gnome/top-level.c -u -r1.140.4.21 -r1.140.4.22
--- src/gnome/top-level.c
+++ src/gnome/top-level.c
@@ -399,12 +399,7 @@
     gnc_load_stock_icons ();
 
     /* Run the ui startup hooks. */
-    {
-      SCM run_danglers = scm_c_eval_string("gnc:hook-run-danglers");
-      SCM hook = scm_c_eval_string("gnc:*ui-startup-hook*");
-      scm_call_1(run_danglers, hook); 
-      gnc_hook_run(HOOK_UI_STARTUP, NULL);
-    }
+    gnc_hook_run(HOOK_UI_STARTUP, NULL);
 
     // return ( main_window . command_line )
     {