Moved ownership of master account into journal_t

The journal_t now completely represents the data part of a session.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/global.cc b/src/global.cc
index 8204bf69..a26d4cd1 100644
--- a/src/global.cc
+++ b/src/global.cc
@@ -435,17 +435,18 @@ void global_scope_t::normalize_report_options(const string& verb)
   item_t::use_effective_date = (rep.HANDLED(effective) &&
 				! rep.HANDLED(actual_dates));
 
-  rep.session.commodity_pool->keep_base	 = rep.HANDLED(base);
-  rep.session.commodity_pool->get_quotes = rep.session.HANDLED(download);
+  rep.session.journal->commodity_pool->keep_base  = rep.HANDLED(base);
+  rep.session.journal->commodity_pool->get_quotes = rep.session.HANDLED(download);
 
   if (rep.session.HANDLED(price_exp_))
-    rep.session.commodity_pool->quote_leeway =
+    rep.session.journal->commodity_pool->quote_leeway =
       rep.session.HANDLER(price_exp_).value.as_long();
 
   if (rep.session.HANDLED(price_db_))
-    rep.session.commodity_pool->price_db = rep.session.HANDLER(price_db_).str();
+    rep.session.journal->commodity_pool->price_db =
+      rep.session.HANDLER(price_db_).str();
   else
-    rep.session.commodity_pool->price_db = none;
+    rep.session.journal->commodity_pool->price_db = none;
 
   if (rep.HANDLED(date_format_))
     set_date_format(rep.HANDLER(date_format_).str().c_str());