#
#
# patch "mtn_cvs/mtn_cvs.cc"
#  from [ed127b51fde453a282866e28ebb8daf9ae202c38]
#    to [d91862fa7b7b92be09ee1a24fb8972fcb6b3faf5]
#
============================================================
--- mtn_cvs/mtn_cvs.cc	ed127b51fde453a282866e28ebb8daf9ae202c38
+++ mtn_cvs/mtn_cvs.cc	d91862fa7b7b92be09ee1a24fb8972fcb6b3faf5
@@ -23,6 +23,7 @@
 #include <cmd.hh>
 #include "mtncvs_state.hh"
 #include <cvs_sync.hh>
+#include "constants.hh"
 
 // options are split into two categories.  the first covers global options,
 // which globally affect program behaviour.  the second covers options
@@ -82,12 +83,12 @@ struct ui_library
 };
 
 // fake app_state ctor/dtor, we do not use this class at all
-app_state::app_state() : db(system_path()), keys(this), work(db,lua), branch_is_sticky(), project(*this) {}
+app_state::app_state() : db(system_path()), keys(*this), work(db,lua), branch_is_sticky(), project(*this) {}
 void app_state::process_options() {}
 app_state::~app_state() {}
 lua_hooks::lua_hooks() {}
 lua_hooks::~lua_hooks() {}
-key_store::key_store(app_state*) {}
+key_store::key_store(app_state&a) : app(a) {}
 database::database(system_path const&) : roster_cache(constants::db_roster_cache_sz,roster_writeback_manager(*this)) {}
 database::~database() {}
 outdated_indicator_factory::outdated_indicator_factory() {}