@@ -553,7 +553,7 @@ UniValue importwallet(const JSONRPCRequest& request)
553
553
554
554
// Use uiInterface.ShowProgress instead of pwallet.ShowProgress because pwallet.ShowProgress has a cancel button tied to AbortRescan which
555
555
// we don't want for this progress bar showing the import progress. uiInterface.ShowProgress does not have a cancel button.
556
- uiInterface.ShowProgress (_ (" Importing..." ), 0 , false ); // show progress dialog in GUI
556
+ uiInterface.ShowProgress (strprintf ( " %s " + _ (" Importing..." ), pwallet-> GetDisplayName () ), 0 , false ); // show progress dialog in GUI
557
557
while (file.good ()) {
558
558
uiInterface.ShowProgress (" " , std::max (1 , std::min (99 , (int )(((double )file.tellg () / (double )nFilesize) * 100 ))), false );
559
559
std::string line;
@@ -571,7 +571,7 @@ UniValue importwallet(const JSONRPCRequest& request)
571
571
assert (key.VerifyPubKey (pubkey));
572
572
CKeyID keyid = pubkey.GetID ();
573
573
if (pwallet->HaveKey (keyid)) {
574
- LogPrintf (" Skipping import of %s (key already present)\n " , EncodeDestination (keyid));
574
+ pwallet-> WalletLogPrintf (" Skipping import of %s (key already present)\n " , EncodeDestination (keyid));
575
575
continue ;
576
576
}
577
577
int64_t nTime = DecodeDumpTime (vstr[1 ]);
@@ -589,7 +589,7 @@ UniValue importwallet(const JSONRPCRequest& request)
589
589
fLabel = true ;
590
590
}
591
591
}
592
- LogPrintf (" Importing %s...\n " , EncodeDestination (keyid));
592
+ pwallet-> WalletLogPrintf (" Importing %s...\n " , EncodeDestination (keyid));
593
593
if (!pwallet->AddKeyPubKey (key, pubkey)) {
594
594
fGood = false ;
595
595
continue ;
@@ -603,11 +603,11 @@ UniValue importwallet(const JSONRPCRequest& request)
603
603
CScript script = CScript (vData.begin (), vData.end ());
604
604
CScriptID id (script);
605
605
if (pwallet->HaveCScript (id)) {
606
- LogPrintf (" Skipping import of %s (script already present)\n " , vstr[0 ]);
606
+ pwallet-> WalletLogPrintf (" Skipping import of %s (script already present)\n " , vstr[0 ]);
607
607
continue ;
608
608
}
609
609
if (!pwallet->AddCScript (script)) {
610
- LogPrintf (" Error importing script %s\n " , vstr[0 ]);
610
+ pwallet-> WalletLogPrintf (" Error importing script %s\n " , vstr[0 ]);
611
611
fGood = false ;
612
612
continue ;
613
613
}
0 commit comments