From 41db89c5161e9901f955422c2f62222fa7f41d3a Mon Sep 17 00:00:00 2001 From: David Hampton Date: Thu, 9 Mar 2006 02:29:29 +0000 Subject: [PATCH] Remove functions to be deprecated in libqof2. (Pass One - trivial substitutions) git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13545 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 3 ++ src/app-utils/gnc-component-manager.c | 4 +-- src/backend/file/test/test-xml-pricedb.c | 4 +-- src/backend/postgres/PostgresBackend.c | 28 +++++++++---------- src/backend/postgres/account.c | 4 +-- src/backend/postgres/price.c | 6 ++-- src/backend/postgres/test/test-db.c | 6 ++-- src/backend/postgres/test/test-period.c | 4 +-- src/backend/postgres/txn.c | 18 ++++++------ src/backend/postgres/txnmass.c | 4 +-- src/bin/gnucash-bin.c | 6 ++-- src/engine/Transaction.c | 8 +++--- src/engine/gnc-engine.c | 8 +++--- src/engine/test/test-period.c | 4 +-- src/gnome-utils/account-quickfill.c | 4 +-- src/gnome-utils/gnc-account-sel.c | 4 +-- src/gnome-utils/gnc-file.c | 18 ++++++------ src/gnome-utils/gnc-main-window.c | 4 +-- src/gnome-utils/gnc-tree-model-commodity.c | 4 +-- src/gnome-utils/gnc-tree-model-price.c | 4 +-- src/gnome/dialog-chart-export.c | 4 +-- src/gnome/druid-acct-period.c | 4 +-- src/gnome/druid-merge.c | 2 +- src/gnome/gnc-plugin-basic-commands.c | 4 +-- src/gnome/gnc-plugin-page-register.c | 4 +-- src/gnome/lot-viewer.c | 4 +-- src/import-export/log-replay/gnc-log-replay.c | 2 +- src/import-export/mt940/gnc-mt940-import.c | 2 +- src/import-export/ofx/gnc-ofx-import.c | 2 +- .../report-gnome/gnc-plugin-page-report.c | 2 +- 30 files changed, 89 insertions(+), 86 deletions(-) diff --git a/ChangeLog b/ChangeLog index f71f5602e2..c47395f2e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-03-08 David Hampton + * numerous: Remove functions to be deprecated in libqof2. (Pass + One - trivial substitutions) + * src/gnome-utils/gnc-tree-model-account.c: * src/engine/Account.c: * src/engine/Group.c: Remove extra events added in r13483. This diff --git a/src/app-utils/gnc-component-manager.c b/src/app-utils/gnc-component-manager.c index c7c27fc93e..7aff22e39e 100644 --- a/src/app-utils/gnc-component-manager.c +++ b/src/app-utils/gnc-component-manager.c @@ -302,7 +302,7 @@ gnc_component_manager_init (void) changes_backup.event_masks = g_hash_table_new (g_str_hash, g_str_equal); changes_backup.entity_events = guid_hash_table_new (); - handler_id = gnc_engine_register_event_handler (gnc_cm_event_handler, NULL); + handler_id = qof_event_register_old_handler (gnc_cm_event_handler, NULL); } void @@ -326,7 +326,7 @@ gnc_component_manager_shutdown (void) destroy_event_hash (changes_backup.entity_events); changes_backup.entity_events = NULL; - gnc_engine_unregister_event_handler (handler_id); + qof_event_unregister_handler (handler_id); } static ComponentInfo * diff --git a/src/backend/file/test/test-xml-pricedb.c b/src/backend/file/test/test-xml-pricedb.c index 596cf402e1..38c82bc201 100644 --- a/src/backend/file/test/test-xml-pricedb.c +++ b/src/backend/file/test/test-xml-pricedb.c @@ -151,8 +151,8 @@ main (int argc, char ** argv) qof_init(); cashobjects_register(); qof_log_init_filename("/tmp/gnctest.trace"); - qof_log_set_default(GNC_LOG_DETAIL); - gnc_set_log_level(GNC_MOD_PRICE, GNC_LOG_DETAIL); + qof_log_set_default(QOF_LOG_DETAIL); + qof_log_set_level(GNC_MOD_PRICE, QOF_LOG_DETAIL); session = qof_session_new (); test_generation (); print_test_results (); diff --git a/src/backend/postgres/PostgresBackend.c b/src/backend/postgres/PostgresBackend.c index 142d8c6498..1e899e0ec8 100644 --- a/src/backend/postgres/PostgresBackend.c +++ b/src/backend/postgres/PostgresBackend.c @@ -723,7 +723,7 @@ pgendRunQuery (QofBackend *bend, gpointer q_p) if (!be || !q) { LEAVE("(null) args"); return; } be->version_check = (guint32) time(0); - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); /* first thing we do is convert the gnc-engine query into @@ -761,7 +761,7 @@ pgendRunQuery (QofBackend *bend, gpointer q_p) xaccGroupMarkSaved (topgroup); pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); LEAVE (" "); } @@ -800,7 +800,7 @@ pgendGetAllTransactions (PGBackend *be, AccountGroup *grp) { GList *node, *xaction_list = NULL; - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); SEND_QUERY (be, "SELECT transGuid FROM gncTransaction;", ); @@ -817,7 +817,7 @@ pgendGetAllTransactions (PGBackend *be, AccountGroup *grp) xaccAccountGroupCommitEdit (grp); pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); } #endif @@ -901,7 +901,7 @@ pgendSync (QofBackend *bend, QofBook *book) pgendStoreAllTransactions (be, grp); /* don't send events to GUI, don't accept callbacks to backend */ - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); pgendKVPInit(be); @@ -926,7 +926,7 @@ pgendSync (QofBackend *bend, QofBook *book) /* re-enable events */ pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); LEAVE(" "); } @@ -1072,14 +1072,14 @@ pgendSyncPriceDB (QofBackend *bend, QofBook *book) pgendStorePriceDB (be, book); /* don't send events to GUI, don't accept callbacks to backend */ - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); pgendGetAllPricesInBook (be, book); /* re-enable events */ pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); LEAVE(" "); } @@ -1490,7 +1490,7 @@ pgend_book_load_poll (QofBackend *bend, QofBook *book) if (!be) return; /* don't send events to GUI, don't accept callbacks to backend */ - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); be->version_check = (guint32) time(0); @@ -1518,7 +1518,7 @@ pgend_book_load_poll (QofBackend *bend, QofBook *book) /* re-enable events */ pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); } /* ============================================================= */ @@ -1538,7 +1538,7 @@ pgend_book_load_single (QofBackend *bend, QofBook *book) /* don't send events to GUI, don't accept callbacks to backend */ - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); be->version_check = (guint32) time(0); @@ -1560,7 +1560,7 @@ pgend_book_load_single (QofBackend *bend, QofBook *book) /* re-enable events */ pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); } /* ============================================================= */ @@ -1580,7 +1580,7 @@ pgend_price_load_single (QofBackend *bend, QofBook *book) pgend_set_book (be, book); /* don't send events to GUI, don't accept callbacks to backend */ - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); be->version_check = (guint32) time(0); @@ -1588,7 +1588,7 @@ pgend_price_load_single (QofBackend *bend, QofBook *book) /* re-enable events */ pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); LEAVE(" "); } diff --git a/src/backend/postgres/account.c b/src/backend/postgres/account.c index 839a65b2ef..3de4242abb 100644 --- a/src/backend/postgres/account.c +++ b/src/backend/postgres/account.c @@ -502,7 +502,7 @@ pgendCopyAccountToEngine (PGBackend *be, const GUID *acct_guid) if (!be || !acct_guid) return 0; /* disable callbacks into the backend, and events to GUI */ - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); /* First, see if we already have such an account */ @@ -555,7 +555,7 @@ pgendCopyAccountToEngine (PGBackend *be, const GUID *acct_guid) /* re-enable events to the backend and GUI */ pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); LEAVE (" "); return acc; diff --git a/src/backend/postgres/price.c b/src/backend/postgres/price.c index 1dab103340..fd7ae93978 100644 --- a/src/backend/postgres/price.c +++ b/src/backend/postgres/price.c @@ -379,7 +379,7 @@ pgendPriceFind (QofBackend *bend, gpointer olook) currency_str = gnc_commodity_get_unique_name(look->currency); /* don't send events to GUI, don't accept callbacks to backend */ - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); /* set up the common part of the query */ @@ -432,7 +432,7 @@ pgendPriceFind (QofBackend *bend, gpointer olook) PERR ("unknown lookup type %d", look->type); /* re-enable events */ pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); LEAVE(" "); return; } @@ -442,7 +442,7 @@ pgendPriceFind (QofBackend *bend, gpointer olook) /* re-enable events */ pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); LEAVE(" "); } diff --git a/src/backend/postgres/test/test-db.c b/src/backend/postgres/test/test-db.c index 085ceac9ab..9e8b2daaf4 100644 --- a/src/backend/postgres/test/test-db.c +++ b/src/backend/postgres/test/test-db.c @@ -509,7 +509,7 @@ test_raw_query(QofSession * session, Query * q) book = qof_session_get_book(session); be = (PGBackend *) qof_book_get_backend(book); - if (gnc_should_log(log_module, GNC_LOG_DETAIL)) + if (qof_log_check(log_module, QOF_LOG_DETAIL)) qof_query_print(qn); sq = sqlQuery_new(); @@ -1059,7 +1059,7 @@ test_performance(DbInfo *dbinfo) session = get_random_session(); - gnc_set_log_level(MOD_TEST, GNC_LOG_WARNING); + qof_log_set_level(MOD_TEST, QOF_LOG_WARNING); dbinfo->mode = sumode; START_CLOCK(0, "Starting to save session"); @@ -1074,7 +1074,7 @@ test_performance(DbInfo *dbinfo) if (!load_db_file(session, dbinfo, FALSE)) return; - gnc_set_log_level(MOD_TEST, GNC_LOG_INFO); + qof_log_set_level(MOD_TEST, QOF_LOG_INFO); START_CLOCK(0, "Starting to save transactions"); add_random_transactions_to_book(qof_session_get_book(session), 100); diff --git a/src/backend/postgres/test/test-period.c b/src/backend/postgres/test/test-period.c index 3d814b8ab0..873415ac75 100644 --- a/src/backend/postgres/test/test-period.c +++ b/src/backend/postgres/test/test-period.c @@ -131,8 +131,8 @@ run_test (void) io_err = qof_session_get_error (session); g_return_if_fail (io_err == ERR_BACKEND_NO_ERR); - gnc_set_logfile (stdout); - gnc_set_log_level_global (GNC_LOG_INFO); + qof_log_set_file (stdout); + qof_log_set_level_registered (QOF_LOG_INFO); closedbook = gnc_book_close_period (openbook, tsmiddle, NULL, "this is opening balance dude"); diff --git a/src/backend/postgres/txn.c b/src/backend/postgres/txn.c index a9b1886a47..4c8ad2a245 100644 --- a/src/backend/postgres/txn.c +++ b/src/backend/postgres/txn.c @@ -660,7 +660,7 @@ pgendCopyTransactionToEngine (PGBackend *be, const GUID *trans_guid) if (!be || !trans_guid) return 0; /* disable callbacks into the backend, and events to GUI */ - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); /* first, see if we already have such a transaction */ @@ -679,7 +679,7 @@ pgendCopyTransactionToEngine (PGBackend *be, const GUID *trans_guid) { PINFO ("fresh data, skip check"); pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); return 0; } } @@ -710,7 +710,7 @@ pgendCopyTransactionToEngine (PGBackend *be, const GUID *trans_guid) PERR ("no such transaction in the database. This is unexpected ...\n"); qof_backend_set_error (&be->be, ERR_SQL_MISSING_DATA); pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); return 0; } @@ -723,7 +723,7 @@ pgendCopyTransactionToEngine (PGBackend *be, const GUID *trans_guid) guid_to_string (trans_guid)); qof_backend_set_error (&be->be, ERR_BACKEND_DATA_CORRUPT); pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); return 0; } @@ -791,7 +791,7 @@ pgendCopyTransactionToEngine (PGBackend *be, const GUID *trans_guid) if (0 <= engine_data_is_newer) { pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); return engine_data_is_newer; } @@ -838,7 +838,7 @@ pgendCopyTransactionToEngine (PGBackend *be, const GUID *trans_guid) /* re-enable events to the backend and GUI */ pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); LEAVE (" "); return -1; @@ -875,7 +875,7 @@ pgendSyncTransaction (PGBackend *be, GUID *trans_guid) if (!be || !trans_guid) return; /* disable callbacks into the backend, and events to GUI */ - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); engine_data_is_newer = xxxpgendCopyTransactionToEngine (be, trans_guid); @@ -897,13 +897,13 @@ pgendSyncTransaction (PGBackend *be, GUID *trans_guid) * framework */ pgendStoreTransaction (be, trans); - gnc_engine_resume_events(); + qof_event_resume(); return; } /* re-enable events to the backend and GUI */ pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); LEAVE (" "); } diff --git a/src/backend/postgres/txnmass.c b/src/backend/postgres/txnmass.c index 0e81314416..4873ff8acb 100644 --- a/src/backend/postgres/txnmass.c +++ b/src/backend/postgres/txnmass.c @@ -220,7 +220,7 @@ pgendGetMassTransactions (PGBackend *be, QofBook *book) GList *node, *xaction_list = NULL; AccountGroup *grp; - gnc_engine_suspend_events(); + qof_event_suspend(); pgendDisable(be); /* design note: someday, we might get a performance boost by adding @@ -286,7 +286,7 @@ pgendGetMassTransactions (PGBackend *be, QofBook *book) xaccAccountGroupCommitEdit (grp); pgendEnable(be); - gnc_engine_resume_events(); + qof_event_resume(); } /* ======================== END OF FILE ======================== */ diff --git a/src/bin/gnucash-bin.c b/src/bin/gnucash-bin.c index 0cfe4a86cc..4307627d7a 100644 --- a/src/bin/gnucash-bin.c +++ b/src/bin/gnucash-bin.c @@ -386,7 +386,7 @@ inner_main_add_price_quotes(void *closure, int argc, char **argv) load_gnucash_modules(); - gnc_engine_suspend_events(); + qof_event_suspend(); g_message("Beginning to install price-quote sources"); scm_c_eval_string("(gnc:price-quotes-install-sources)"); @@ -403,7 +403,7 @@ inner_main_add_price_quotes(void *closure, int argc, char **argv) g_print(_("No quotes retrieved. Finance::Quote isn't installed properly.\n")); } - gnc_engine_resume_events(); + qof_event_resume(); gnc_shutdown(0); return; } @@ -440,7 +440,7 @@ inner_main (void *closure, int argc, char **argv) /* set a log level before trying to change it globally */ gnc_log_default(); - qof_log_set_level_global(loglevel); + qof_log_set_level_registered(loglevel); load_system_config(); load_user_config(); diff --git a/src/engine/Transaction.c b/src/engine/Transaction.c index c87634a1c7..32e00f59fe 100644 --- a/src/engine/Transaction.c +++ b/src/engine/Transaction.c @@ -400,7 +400,7 @@ xaccTransClone (const Transaction *t) Split *split; GList *node; - gnc_engine_suspend_events(); + qof_event_suspend(); trans = g_new0 (Transaction, 1); trans->date_entered = t->date_entered; @@ -427,7 +427,7 @@ xaccTransClone (const Transaction *t) } qof_instance_set_dirty(QOF_INSTANCE(trans)); xaccTransCommitEdit(trans); - gnc_engine_resume_events(); + qof_event_resume(); return trans; } @@ -942,7 +942,7 @@ static void trans_cleanup_commit(Transaction *trans) /* ------------------------------------------------- */ /* Make sure all associated splits are in proper order * in their accounts with the correct balances. */ - gnc_engine_suspend_events(); + qof_event_suspend(); /* Iterate over existing splits */ slist = g_list_copy(trans->splits); @@ -971,7 +971,7 @@ static void trans_cleanup_commit(Transaction *trans) } g_list_free(slist); - gnc_engine_resume_events(); + qof_event_resume(); xaccTransWriteLog (trans, 'C'); diff --git a/src/engine/gnc-engine.c b/src/engine/gnc-engine.c index 1a76ff5ec1..1745818d23 100644 --- a/src/engine/gnc-engine.c +++ b/src/engine/gnc-engine.c @@ -85,10 +85,10 @@ gnc_engine_init(int argc, char ** argv) qof_log_init_filename("/tmp/gnucash.trace"); /* Only set the core log_modules here the rest can be set locally. */ - gnc_set_log_level(GNC_MOD_ENGINE, GNC_LOG_WARNING); - gnc_set_log_level(GNC_MOD_IO, GNC_LOG_WARNING); - gnc_set_log_level(GNC_MOD_GUI, GNC_LOG_WARNING); - qof_log_set_default(GNC_LOG_WARNING); + qof_log_set_level(GNC_MOD_ENGINE, QOF_LOG_WARNING); + qof_log_set_level(GNC_MOD_IO, QOF_LOG_WARNING); + qof_log_set_level(GNC_MOD_GUI, QOF_LOG_WARNING); + qof_log_set_default(QOF_LOG_WARNING); /* initialize QOF */ qof_init(); diff --git a/src/engine/test/test-period.c b/src/engine/test/test-period.c index a8bf6dcbba..205539baec 100644 --- a/src/engine/test/test-period.c +++ b/src/engine/test/test-period.c @@ -118,8 +118,8 @@ run_test (void) tsmiddle = tsfirst; tsmiddle.tv_sec = (tsfirst.tv_sec + tslast.tv_sec)/2; - gnc_set_logfile (stdout); - gnc_set_log_level_global (GNC_LOG_WARNING); + qof_log_set_file (stdout); + qof_log_set_level_registered (QOF_LOG_WARNING); closedbook = gnc_book_close_period (openbook, tsmiddle, equity, "this is opening balance dude"); diff --git a/src/gnome-utils/account-quickfill.c b/src/gnome-utils/account-quickfill.c index af31f3b8e1..d8b108d423 100644 --- a/src/gnome-utils/account-quickfill.c +++ b/src/gnome-utils/account-quickfill.c @@ -61,7 +61,7 @@ shared_quickfill_destroy (QofBook *book, gpointer key, gpointer user_data) qfb); gnc_quickfill_destroy (qfb->qf); g_object_unref(qfb->list_store); - gnc_engine_unregister_event_handler (qfb->listener); + qof_event_unregister_handler (qfb->listener); g_free (qfb); } @@ -177,7 +177,7 @@ build_shared_quickfill (QofBook *book, AccountGroup *group, const char * key, xaccGroupForEachAccount (group, load_shared_qf_cb, qfb, TRUE); qfb->listener = - gnc_engine_register_event_handler (listen_for_account_events, qfb); + qof_event_register_old_handler (listen_for_account_events, qfb); qof_book_set_data_fin (book, key, qfb, shared_quickfill_destroy); diff --git a/src/gnome-utils/gnc-account-sel.c b/src/gnome-utils/gnc-account-sel.c index dbb7b64140..b3cc2aae0d 100644 --- a/src/gnome-utils/gnc-account-sel.c +++ b/src/gnome-utils/gnc-account-sel.c @@ -157,7 +157,7 @@ gnc_account_sel_init (GNCAccountSel *gas) gas_populate_list( gas ); gas->eventHandlerId = - gnc_engine_register_event_handler( gnc_account_sel_event_cb, gas ); + qof_event_register_old_handler( gnc_account_sel_event_cb, gas ); gas->initDone = TRUE; } @@ -446,7 +446,7 @@ gnc_account_sel_dispose (GObject *object) gas = GNC_ACCOUNT_SEL (object); if (gas->eventHandlerId) { - gnc_engine_unregister_event_handler (gas->eventHandlerId); + qof_event_unregister_handler (gas->eventHandlerId); gas->eventHandlerId = 0; } diff --git a/src/gnome-utils/gnc-file.c b/src/gnome-utils/gnc-file.c index d5d537835f..ad367f8e65 100644 --- a/src/gnome-utils/gnc-file.c +++ b/src/gnome-utils/gnc-file.c @@ -506,14 +506,14 @@ gnc_file_new (void) /* close any ongoing file sessions, and free the accounts. * disable events so we don't get spammed by redraws. */ - gnc_engine_suspend_events (); + qof_event_suspend (); qof_session_call_close_hooks(session); gnc_hook_run(HOOK_BOOK_CLOSED, session); gnc_close_gui_component_by_session (session); gnc_clear_current_session(); - gnc_engine_resume_events (); + qof_event_resume (); } /* start a new book */ @@ -614,7 +614,7 @@ gnc_post_file_open (const char * filename) /* disable events while moving over to the new set of accounts; * the mass deletetion of accounts and transactions during * switchover would otherwise cause excessive redraws. */ - gnc_engine_suspend_events (); + qof_event_suspend (); /* Change the mouse to a busy cursor */ gnc_set_busy_cursor (NULL, TRUE); @@ -773,7 +773,7 @@ gnc_post_file_open (const char * filename) g_free (newfile); - gnc_engine_resume_events (); + qof_event_resume (); gnc_gui_refresh_all (); return FALSE; @@ -790,7 +790,7 @@ gnc_post_file_open (const char * filename) g_free (newfile); - gnc_engine_resume_events (); + qof_event_resume (); gnc_gui_refresh_all (); /* Call this after re-enabling events. */ @@ -860,7 +860,7 @@ gnc_file_export_file(const char * newfile) gnc_gconf_set_string(GCONF_SECTION, KEY_LAST_PATH, default_dir, NULL); g_free(default_dir); - gnc_engine_suspend_events(); + qof_event_suspend(); /* -- this session code is NOT identical in FileOpen and FileSaveAs -- */ @@ -907,7 +907,7 @@ gnc_file_export_file(const char * newfile) xaccLogDisable(); qof_session_destroy (new_session); xaccLogEnable(); - gnc_engine_resume_events(); + qof_event_resume(); if (!ok) { @@ -1108,7 +1108,7 @@ gnc_file_quit (void) /* disable events; otherwise the mass deletetion of accounts and * transactions during shutdown would cause massive redraws */ - gnc_engine_suspend_events (); + qof_event_suspend (); qof_session_call_close_hooks(session); gnc_hook_run(HOOK_BOOK_CLOSED, session); @@ -1117,7 +1117,7 @@ gnc_file_quit (void) gnc_get_current_session (); - gnc_engine_resume_events (); + qof_event_resume (); gnc_unset_busy_cursor (NULL); } diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c index f908490653..eaf9b68080 100644 --- a/src/gnome-utils/gnc-main-window.c +++ b/src/gnome-utils/gnc-main-window.c @@ -1622,7 +1622,7 @@ gnc_main_window_init (GncMainWindow *window, g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); priv->event_handler_id = - gnc_engine_register_event_handler(gnc_main_window_event_handler, + qof_event_register_old_handler(gnc_main_window_event_handler, window); gnc_main_window_setup_window (window); @@ -1693,7 +1693,7 @@ gnc_main_window_destroy (GtkObject *object) gnc_gconf_remove_notification(G_OBJECT(window), DESKTOP_GNOME_INTERFACE); gnc_gconf_remove_notification(G_OBJECT(window), GCONF_GENERAL); - gnc_engine_unregister_event_handler(priv->event_handler_id); + qof_event_unregister_handler(priv->event_handler_id); priv->event_handler_id = 0; g_hash_table_destroy (priv->merged_actions_table); diff --git a/src/gnome-utils/gnc-tree-model-commodity.c b/src/gnome-utils/gnc-tree-model-commodity.c index 024a48d7b3..0c143498ab 100644 --- a/src/gnome-utils/gnc-tree-model-commodity.c +++ b/src/gnome-utils/gnc-tree-model-commodity.c @@ -191,7 +191,7 @@ gnc_tree_model_commodity_dispose (GObject *object) priv = GNC_TREE_MODEL_COMMODITY_GET_PRIVATE(model); if (priv->event_handler_id) { - gnc_engine_unregister_event_handler (priv->event_handler_id); + qof_event_unregister_handler (priv->event_handler_id); priv->event_handler_id = 0; } @@ -224,7 +224,7 @@ gnc_tree_model_commodity_new (QofBook *book, gnc_commodity_table *ct) priv->commodity_table = ct; priv->event_handler_id = - gnc_engine_register_event_handler (gnc_tree_model_commodity_event_handler, model); + qof_event_register_old_handler (gnc_tree_model_commodity_event_handler, model); return GTK_TREE_MODEL (model); } diff --git a/src/gnome-utils/gnc-tree-model-price.c b/src/gnome-utils/gnc-tree-model-price.c index 56ec51502f..8485229ea5 100644 --- a/src/gnome-utils/gnc-tree-model-price.c +++ b/src/gnome-utils/gnc-tree-model-price.c @@ -217,7 +217,7 @@ gnc_tree_model_price_dispose (GObject *object) priv = GNC_TREE_MODEL_PRICE_GET_PRIVATE(model); if (priv->event_handler_id) { - gnc_engine_unregister_event_handler (priv->event_handler_id); + qof_event_unregister_handler (priv->event_handler_id); priv->event_handler_id = 0; } @@ -252,7 +252,7 @@ gnc_tree_model_price_new (QofBook *book, GNCPriceDB *price_db) priv->price_db = price_db; priv->event_handler_id = - gnc_engine_register_event_handler (gnc_tree_model_price_event_handler, model); + qof_event_register_old_handler (gnc_tree_model_price_event_handler, model); return GTK_TREE_MODEL (model); } diff --git a/src/gnome/dialog-chart-export.c b/src/gnome/dialog-chart-export.c index 5a3858d9b7..5ddf01730f 100644 --- a/src/gnome/dialog-chart-export.c +++ b/src/gnome/dialog-chart-export.c @@ -234,7 +234,7 @@ on_dateok_clicked (chart_data *data) if (filename) { gnc_set_busy_cursor(NULL, TRUE); - gnc_engine_suspend_events(); + qof_event_suspend(); qof_session_begin(chart_session, filename, TRUE, TRUE); data->chart_session = chart_session; data->equity_account = NULL; @@ -259,7 +259,7 @@ on_dateok_clicked (chart_data *data) qof_session_save(chart_session, NULL); show_session_error(qof_session_get_error(chart_session), filename, GNC_FILE_DIALOG_EXPORT); - gnc_engine_resume_events(); + qof_event_resume(); gnc_unset_busy_cursor(NULL); } qof_session_end(chart_session); diff --git a/src/gnome/druid-acct-period.c b/src/gnome/druid-acct-period.c index df90801da1..126d13aabe 100644 --- a/src/gnome/druid-acct-period.c +++ b/src/gnome/druid-acct-period.c @@ -430,7 +430,7 @@ ap_close_period (GnomeDruidPage *druidpage, if (really_do_close_books) { /* Close the books ! */ - gnc_engine_suspend_events (); + qof_event_suspend (); gnc_suspend_gui_refresh (); scrub_all(); @@ -448,7 +448,7 @@ ap_close_period (GnomeDruidPage *druidpage, */ gnc_file_save (); gnc_resume_gui_refresh (); - gnc_engine_resume_events (); + qof_event_resume (); gnc_gui_refresh_all (); /* resume above should have been enough ??? */ } g_free(bnotes); diff --git a/src/gnome/druid-merge.c b/src/gnome/druid-merge.c index 089ba325a4..2a6426129f 100644 --- a/src/gnome/druid-merge.c +++ b/src/gnome/druid-merge.c @@ -374,7 +374,7 @@ void gnc_ui_qsf_import_merge_druid (QofSession *original, QofSession *import) { if (qsf_import_merge_window) { return; } - gnc_engine_suspend_events (); + qof_event_suspend (); qsf_import_merge_window = gnc_create_import_druid(); g_return_if_fail(qsf_import_merge_window != NULL); previous_session = original; diff --git a/src/gnome/gnc-plugin-basic-commands.c b/src/gnome/gnc-plugin-basic-commands.c index 827b04a5de..55a596cb6e 100644 --- a/src/gnome/gnc-plugin-basic-commands.c +++ b/src/gnome/gnc-plugin-basic-commands.c @@ -341,7 +341,7 @@ qsf_file_select_ok(GtkWidget *w, GtkFileSelection *fs ) QofBook *original; ENTER (" "); - gnc_engine_suspend_events(); + qof_event_suspend(); filename = gtk_file_selection_get_filename(GTK_FILE_SELECTION (fs)); gtk_widget_destroy((GtkWidget*) fs); first_session = gnc_get_current_session(); @@ -349,7 +349,7 @@ qsf_file_select_ok(GtkWidget *w, GtkFileSelection *fs ) qsf_session = qof_session_new(); qof_session_begin(qsf_session, filename, TRUE, FALSE); qof_session_load(qsf_session, NULL); - gnc_engine_resume_events(); + qof_event_resume(); gnc_ui_qsf_import_merge_druid(first_session, qsf_session); LEAVE (" "); } diff --git a/src/gnome/gnc-plugin-page-register.c b/src/gnome/gnc-plugin-page-register.c index 5107c44001..3cb249536a 100644 --- a/src/gnome/gnc-plugin-page-register.c +++ b/src/gnome/gnc-plugin-page-register.c @@ -1979,7 +1979,7 @@ gnc_plugin_page_register_cmd_reverse_transaction (GtkAction *action, } } - gnc_engine_suspend_events(); + qof_event_suspend(); new_trans = xaccTransClone(trans); xaccTransReverse(new_trans); @@ -1994,7 +1994,7 @@ gnc_plugin_page_register_cmd_reverse_transaction (GtkAction *action, kvp_val = kvp_value_new_guid (xaccTransGetGUID(new_trans)); kvp_frame_set_slot_nc(txn_frame, "reversed-by", kvp_val); xaccTransCommitEdit(trans); - gnc_engine_resume_events(); + qof_event_resume(); /* Now jump to new trans */ gsr = gnc_plugin_page_register_get_gsr(GNC_PLUGIN_PAGE(page)); diff --git a/src/gnome/lot-viewer.c b/src/gnome/lot-viewer.c index de1ff7582c..54d9597231 100644 --- a/src/gnome/lot-viewer.c +++ b/src/gnome/lot-viewer.c @@ -136,7 +136,7 @@ lv_show_splits (GNCLotViewer *lv) if (NULL == lot) return; -/* gnc_engine_suspend_events(); XXX remove when xaccSplitGetCapGains() fixed */ +/* qof_event_suspend(); XXX remove when xaccSplitGetCapGains() fixed */ gtk_clist_freeze (lv->mini_clist); gtk_clist_clear (lv->mini_clist); split_list = gnc_lot_get_split_list (lot); @@ -213,7 +213,7 @@ lv_show_splits (GNCLotViewer *lv) gtk_clist_set_selectable (lv->mini_clist, row, FALSE); } gtk_clist_thaw (lv->mini_clist); -/* gnc_engine_resume_events(); XXX remove when xaccSplitGetCapGains() fixed */ +/* qof_event_resume(); XXX remove when xaccSplitGetCapGains() fixed */ } /* ======================================================================== */ diff --git a/src/import-export/log-replay/gnc-log-replay.c b/src/import-export/log-replay/gnc-log-replay.c index 26313f572a..a2a3d33f88 100644 --- a/src/import-export/log-replay/gnc-log-replay.c +++ b/src/import-export/log-replay/gnc-log-replay.c @@ -512,7 +512,7 @@ void gnc_file_log_replay (void) if (!expected_header) expected_header = g_strdup_printf(expected_header_orig); - gnc_set_log_level(GNC_MOD_IMPORT, GNC_LOG_DEBUG); + qof_log_set_level(GNC_MOD_IMPORT, QOF_LOG_DEBUG); ENTER(" "); default_dir = gnc_gconf_get_string(GCONF_SECTION, KEY_LAST_PATH, NULL); diff --git a/src/import-export/mt940/gnc-mt940-import.c b/src/import-export/mt940/gnc-mt940-import.c index d58fb8537e..8d2b12dfbd 100644 --- a/src/import-export/mt940/gnc-mt940-import.c +++ b/src/import-export/mt940/gnc-mt940-import.c @@ -136,7 +136,7 @@ void gnc_file_mt940_import (void) char *default_dir; int mt940_fd; - /* gnc_should_log(MOD_IMPORT, GNC_LOG_TRACE); */ + /* qof_log_check(MOD_IMPORT, QOF_LOG_TRACE); */ DEBUG("gnc_file_mt940_import(): Begin...\n"); default_dir = gnc_gconf_get_string(GCONF_SECTION, KEY_LAST_PATH, NULL); diff --git a/src/import-export/ofx/gnc-ofx-import.c b/src/import-export/ofx/gnc-ofx-import.c index b4391384a5..9ce5302951 100644 --- a/src/import-export/ofx/gnc-ofx-import.c +++ b/src/import-export/ofx/gnc-ofx-import.c @@ -638,7 +638,7 @@ void gnc_file_ofx_import (void) ofx_INFO_msg = true; ofx_STATUS_msg = false; - gnc_should_log(GNC_MOD_IMPORT, GNC_LOG_TRACE); + qof_log_check(GNC_MOD_IMPORT, QOF_LOG_TRACE); DEBUG("gnc_file_ofx_import(): Begin...\n"); default_dir = gnc_gconf_get_string(GCONF_SECTION, KEY_LAST_PATH, NULL); diff --git a/src/report/report-gnome/gnc-plugin-page-report.c b/src/report/report-gnome/gnc-plugin-page-report.c index d5adf4f67b..df43066241 100644 --- a/src/report/report-gnome/gnc-plugin-page-report.c +++ b/src/report/report-gnome/gnc-plugin-page-report.c @@ -73,7 +73,7 @@ /* NW: you can add GNC_MOD_REPORT to gnc-engine.h or simply define it locally. Any unique string with a gnucash- prefix will do. Then just set a log level -with gnc_set_log_level().*/ +with qof_log_set_level().*/ static QofLogModule log_module = GNC_MOD_GUI; static GObjectClass *parent_class = NULL;