RHEL/Fedora: adds working 'kmymoney'

4 files changed, 515 insertions, 16 deletions

diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-default_money_crash.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-default_money_crash.patch
deleted file mode 100644
index 93cc35bf6..000000000
--- a/redhat/applications/kmymoney/kmymoney-3.5.13-default_money_crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./kmymoney2/mymoney/mymoneyfile.cpp.ORI	2011-11-26 18:31:18.266423206 +0100
-+++ ./kmymoney2/mymoney/mymoneyfile.cpp	2011-11-26 18:31:26.417214675 +0100
-@@ -1940,7 +1940,8 @@
- 
-   const MyMoneySecurity& curr = d->m_cache.security(id);
-   if(curr.id().isEmpty())
--    throw new MYMONEYEXCEPTION("Currency not found.");
-+    return baseCurrency();
-+//    throw new MYMONEYEXCEPTION("Currency not found.");
-   return curr;
- }
- 
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch
new file mode 100644
index 000000000..83bfec920
--- /dev/null
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13-lots_of_crash.patch
@@ -0,0 +1,238 @@
+commit 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1326525051 -0600
+
+    Fix a number of crashes
+
+diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp
+index 52ef770..880b1c2 100644
+--- a/kmymoney2/converter/mymoneyqifprofile.cpp
++++ b/kmymoney2/converter/mymoneyqifprofile.cpp
+@@ -769,7 +769,7 @@ TQString MyMoneyQifProfile::inputDateFormat(void) const
+   possibleDateFormats(list);
+   if(list.count() == 1)
+     return list.first();
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ void MyMoneyQifProfile::possibleDateFormats(TQStringList& list) const
+diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
+index 9390429..a974e8f 100644
+--- a/kmymoney2/converter/mymoneyqifreader.cpp
++++ b/kmymoney2/converter/mymoneyqifreader.cpp
+@@ -714,7 +714,7 @@ const TQString MyMoneyQifReader::extractLine(const TQChar id, int cnt)
+     }
+   }
+   m_extractedLine = -1;
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ void MyMoneyQifReader::extractSplits(TQValueList<qSplit>& listqSplits) const
+diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
+index 4de99f6..beb8e98 100644
+--- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp
++++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
+@@ -53,7 +53,7 @@ KCategoryReassignDlg::~KCategoryReassignDlg()
+ TQString KCategoryReassignDlg::show(const MyMoneyAccount& category)
+ {
+   if (category.id().isEmpty())
+-   return TQString(); // no payee available? nothing can be selected...
++   return TQString::null; // no payee available? nothing can be selected...
+ 
+   AccountSet set;
+   set.addAccountGroup(MyMoneyAccount::Income);
+@@ -79,12 +79,12 @@ TQString KCategoryReassignDlg::show(const MyMoneyAccount& category)
+   // if there is no category for reassignment left, we bail out
+   if(list.isEmpty()) {
+     KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>.  However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").tqarg(category.name())+TQString("</qt>"));
+-    return TQString();
++    return TQString::null;
+   }
+ 
+   // execute dialog and if aborted, return empty string
+   if (this->exec() == TQDialog::Rejected)
+-    return TQString();
++    return TQString::null;
+ 
+   // otherwise return index of selected payee
+   return m_category->selectedItem();
+diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp
+index 884807f..87baaf9 100644
+--- a/kmymoney2/dialogs/knewloanwizard.cpp
++++ b/kmymoney2/dialogs/knewloanwizard.cpp
+@@ -1072,7 +1072,7 @@ int KNewLoanWizard::term(void) const
+ TQString KNewLoanWizard::initialPaymentAccount(void) const
+ {
+   if(m_dontCreatePayoutCheckBox->isChecked()) {
+-    return TQString();
++    return TQString::null;
+   }
+   return m_assetAccountEdit->selectedItems().first();
+ }
+diff --git a/kmymoney2/dialogs/kpayeereassigndlg.cpp b/kmymoney2/dialogs/kpayeereassigndlg.cpp
+index 0c3c0cf..1db13f1 100644
+--- a/kmymoney2/dialogs/kpayeereassigndlg.cpp
++++ b/kmymoney2/dialogs/kpayeereassigndlg.cpp
+@@ -53,13 +53,13 @@ KPayeeReassignDlg::~KPayeeReassignDlg()
+ TQString KPayeeReassignDlg::show(const TQValueList<MyMoneyPayee>& payeeslist)
+ {
+   if (payeeslist.isEmpty())
+-   return TQString(); // no payee available? nothing can be selected...
++   return TQString::null; // no payee available? nothing can be selected...
+ 
+   payeeCombo->loadPayees(payeeslist);
+ 
+   // execute dialog and if aborted, return empty string
+   if (this->exec() == TQDialog::Rejected)
+-    return TQString();
++    return TQString::null;
+ 
+   // otherwise return index of selected payee
+   return payeeCombo->selectedItem();
+diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp
+index 6ef1f9c..c83e834 100644
+--- a/kmymoney2/mymoney/mymoneyaccount.cpp
++++ b/kmymoney2/mymoney/mymoneyaccount.cpp
+@@ -450,7 +450,7 @@ void MyMoneyAccountLoan::setPayee(const TQString& payee)
+ 
+ const TQString MyMoneyAccountLoan::interestAccountId(void) const
+ {
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ void MyMoneyAccountLoan::setInterestAccountId(const TQString& /* id */)
+diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp
+index 4809b28..c59d577 100644
+--- a/kmymoney2/mymoney/mymoneyfile.cpp
++++ b/kmymoney2/mymoney/mymoneyfile.cpp
+@@ -1230,7 +1230,7 @@ TQString MyMoneyFile::locateSubAccount(const MyMoneyAccount& base, const TQStrin
+       return locateSubAccount(nextBase, remainder);
+     }
+   }
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ TQString MyMoneyFile::value(const TQString& key) const
+diff --git a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
+index 22fa1ac..cabf772 100644
+--- a/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
++++ b/kmymoney2/mymoney/mymoneykeyvaluecontainer.cpp
+@@ -55,7 +55,7 @@ const TQString& MyMoneyKeyValueContainer::value(const TQString& key) const
+   it = m_kvp.find(key);
+   if(it != m_kvp.end())
+     return (*it);
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ void MyMoneyKeyValueContainer::setValue(const TQString& key, const TQString& value)
+diff --git a/kmymoney2/mymoney/mymoneyutils.cpp b/kmymoney2/mymoney/mymoneyutils.cpp
+index 08ffff4..8012200 100644
+--- a/kmymoney2/mymoney/mymoneyutils.cpp
++++ b/kmymoney2/mymoney/mymoneyutils.cpp
+@@ -305,7 +305,7 @@ TQString dateToString(const TQDate& date)
+   if(!date.isNull() && date.isValid())
+     return date.toString(Qt::ISODate);
+ 
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ TQDate stringToDate(const TQString& str)
+@@ -323,7 +323,7 @@ TQString TQStringEmpty(const TQString& val)
+   if(!val.isEmpty())
+     return TQString(val);
+ 
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ unsigned long extractId(const TQString& txt)
+diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
+index 084d73c..ec2d4a0 100644
+--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
++++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
+@@ -98,14 +98,14 @@ const TQString& KOnlineBankingtqStatus::appId(void) const
+ {
+   if(m_appId)
+     return m_appId->appId();
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ TQString KOnlineBankingtqStatus::headerVersion(void) const
+ {
+   if(m_headerVersion)
+     return m_headerVersion->headerVersion();
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ #include "konlinebankingstatus.moc"
+diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
+index 36a05b5..7408a38 100644
+--- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
++++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
+@@ -125,7 +125,7 @@ const TQString& OfxAppVersion::appId(void) const
+   TQString app = m_combo->currentText();
+   if(m_appMap[app] != defaultAppId)
+     return m_appMap[app];
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ MyMoneyOfxConnector::MyMoneyOfxConnector(const MyMoneyAccount& _account):
+diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp
+index f8b6489..761b537 100644
+--- a/kmymoney2/widgets/kmymoneycombo.cpp
++++ b/kmymoney2/widgets/kmymoneycombo.cpp
+@@ -588,7 +588,7 @@ public:
+         return it.key();
+       }
+     }
+-    return TQString();
++    return TQString::null;
+   }
+ };
+ 
+diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp
+index ff00c78..f446acf 100644
+--- a/kmymoney2/widgets/kmymoneywizard.cpp
++++ b/kmymoney2/widgets/kmymoneywizard.cpp
+@@ -106,7 +106,7 @@ bool KMyMoneyWizardPage::isComplete(void) const
+ 
+ const TQString& KMyMoneyWizardPage::helpContext(void) const
+ {
+-  return TQString();
++  return TQString::null;
+ }
+ 
+ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, WFlags f) :
+diff --git a/kmymoney2/widgets/registeritem.h b/kmymoney2/widgets/registeritem.h
+index e9c21d3..83b9a04 100644
+--- a/kmymoney2/widgets/registeritem.h
++++ b/kmymoney2/widgets/registeritem.h
+@@ -88,14 +88,14 @@ public:
+   virtual const TQDate& sortPostDate(void) const { return nullDate; }
+   virtual int sortSamePostDate(void) const = 0;
+   virtual const TQDate& sortEntryDate(void) const { return nullDate; }
+-  virtual const TQString& sortPayee(void) const { return TQString(); }
++  virtual const TQString& sortPayee(void) const { return TQString::null; }
+   virtual const MyMoneyMoney& sortValue(void) const { return nullValue; }
+-  virtual const TQString& sortNumber(void) const { return TQString(); }
+-  virtual const TQString& sortEntryOrder(void) const { return TQString(); }
++  virtual const TQString& sortNumber(void) const { return TQString::null; }
++  virtual const TQString& sortEntryOrder(void) const { return TQString::null; }
+   virtual CashFlowDirection sortType(void) const { return Deposit; }
+-  virtual const TQString& sortCategory(void) const { return TQString(); }
++  virtual const TQString& sortCategory(void) const { return TQString::null; }
+   virtual MyMoneySplit::reconcileFlagE sortReconcileState(void) const { return MyMoneySplit::MaxReconcileState; }
+-  virtual const TQString& sortSecurity(void) const { return TQString(); }
++  virtual const TQString& sortSecurity(void) const { return TQString::null; }
+ 
+   /**
+     * This method sets the row offset of the item in the register
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch
new file mode 100644
index 000000000..7aefe2026
--- /dev/null
+++ b/redhat/applications/kmymoney/kmymoney-3.5.13-update_to_1.0.5.patch
@@ -0,0 +1,264 @@
+commit 8654cea10f6902719006d5975db7dc07b2fcc713
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1326571732 -0600
+
+    Update to upstream stable version 1.0.5
+
+diff --git a/ChangeLog b/ChangeLog
+index d250496..c996acb 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,7 +1,40 @@
+ 
++2010-05-15 Thomas Baumgart <ipwizard@users.sourceforge.net>
++  * Released 1.0.5
++
++2010-05-12 Thomas Baumgart <ipwizard@users.sourceforge.net>
++  * Fixed the way to calculate balance variation for the linear regression
++    forecast method (backported from KDE4)
++
++2010-05-09 Alvaro Soliverez <asoliverez@gmail.com>
++  * Fixed a crash when a budget selected for a report is no longer present
++
++2010-05-04 Thomas Baumgart <ipwizard@users.sourceforge.net>
++  * replace all new line characters because we only have one line
++    available for the displayed data (backported from KDE4)
++  * Don't allow import of investment transactions that don't have a share
++    amount. This used to end in a div by zero when calculating the price.
++    (Backported from KDE4)
++
++2010-05-03 Alvaro Soliverez <asoliverez@gmail.com>
++  * Add all overdue schedules when calculating forecast
++  * Do not show accounts of institutions if it has been selected
++    in the general settings to Do not show closed accounts
++  * Do not show an institution if it has no visible accounts and
++    it has been selected to not show closed accounts
++
++2010-04-20 Thomas Baumgart <ipwizard@users.sourceforge.net>
++  * Backported fix from Ian Neal to solve problems when opening the ledger
++    with specific scheduled transactions
++
++2010-04-03 Alvaro Soliverez <asoliverez@gmail.com>
++  * Fixed loop in payments of the home page when a schedule is set to
++    end by date
++
+ 2010-03-30 Thomas Baumgart <ipwizard@users.sourceforge.net>
+   * Backported encoding patch from KDE4 version
+   * Bumped version number
++  * Released 1.0.4
+ 
+ 2010-03-29 Thomas Baumgart <ipwizard@users.sourceforge.net>
+   * Updated Finnish translation by Mikael Kujanpaa
+diff --git a/configure.in b/configure.in
+index 8a6c1b8..1a8dd02 100644
+--- a/configure.in
++++ b/configure.in
+@@ -40,7 +40,7 @@ dnl Perform program name transformation
+ AC_ARG_PROGRAM
+ 
+ dnl Automake doc recommends to do this only here. (Janos)
+-AM_INIT_AUTOMAKE(kmymoney2, 1.0.4) dnl searches for some needed programs
++AM_INIT_AUTOMAKE(kmymoney2, 1.0.5) dnl searches for some needed programs
+ 
+ KDE_SET_PREFIX
+ 
+diff --git a/configure.in.in b/configure.in.in
+index 3f82103..a90f40f 100644
+--- a/configure.in.in
++++ b/configure.in.in
+@@ -1,6 +1,6 @@
+ #MIN_CONFIG(3.3.1)
+ 
+-AM_INIT_AUTOMAKE(kmymoney2,1.0.4)
++AM_INIT_AUTOMAKE(kmymoney2,1.0.5)
+ 
+ KDE_ENABLE_HIDDEN_VISIBILITY
+ 
+diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
+index 6756767..c08dcff 100644
+--- a/kmymoney2/converter/mymoneystatementreader.cpp
++++ b/kmymoney2/converter/mymoneystatementreader.cpp
+@@ -664,6 +664,10 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
+       if(!t_in.m_price.isZero()) {
+         s1.setPrice(t_in.m_price);
+       } else {
++        if(t_in.m_shares.isZero()) {
++          KMessageBox::information(0, i18n("This imported statement contains investment transactions with no share amount.  These transactions will be ignored."), i18n("No share amount provided"), TQString("BlankAmount"));
++          return;
++        }
+         s1.setPrice(((t_in.m_amount - t_in.m_fees) / t_in.m_shares).convert(MyMoneyMoney::precToDenom(KMyMoneyGlobalSettings::pricePrecision())));
+       }
+ 
+diff --git a/kmymoney2/mymoney/mymoneyforecast.cpp b/kmymoney2/mymoney/mymoneyforecast.cpp
+index bfecce0..c1c88c7 100644
+--- a/kmymoney2/mymoney/mymoneyforecast.cpp
++++ b/kmymoney2/mymoney/mymoneyforecast.cpp
+@@ -651,7 +651,7 @@ void MyMoneyForecast::addScheduledTransactions (void)
+   TQValueList<MyMoneySchedule> schedule;
+ 
+   schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::STYPE_ANY,
+-                                TQDate::tqcurrentDate(), forecastEndDate());
++                                TQDate(), forecastEndDate());
+   if(schedule.count() > 0) {
+     TQValueList<MyMoneySchedule>::Iterator it;
+     do {
+@@ -871,8 +871,21 @@ MyMoneyMoney MyMoneyForecast::accountCycleVariation(const MyMoneyAccount& acc)
+   MyMoneyMoney cycleVariation;
+ 
+   if (forecastMethod() == eHistoric) {
+-    for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) {
+-      cycleVariation += m_accountTrendList[acc.id()][t_day];
++    switch(historyMethod()) {
++      case 0:
++      case 1:
++        {
++          for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) {
++            cycleVariation += m_accountTrendList[acc.id()][t_day];
++          }
++        }
++        break;
++
++      case 2:
++        {
++          cycleVariation = m_accountList[acc.id()][TQDate::currentDate().addDays(accountsCycle())] - m_accountList[acc.id()][TQDate::currentDate()];
++        }
++        break;
+     }
+   }
+   return cycleVariation;
+diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp
+index db73062..b75ffb9 100644
+--- a/kmymoney2/reports/pivottable.cpp
++++ b/kmymoney2/reports/pivottable.cpp
+@@ -825,9 +825,27 @@ void PivotTable::calculateBudgetMapping( void )
+     //
+     // It will choose the first budget in the list for the start year of the report if no budget is select
+     MyMoneyBudget budget = MyMoneyBudget();
++    
++    TQValueList<MyMoneyBudget> budgets = file->budgetList();
++    bool validBudget = false;
++    
++    //check that the selected budget is valid
++    if (m_config_f.budget() != "Any") {
++      TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin();
++      while( budgets_it != budgets.end() ) {
++        //pick the budget by id
++        if ((*budgets_it).id() == m_config_f.budget()) {
++          budget = file->budget((*budgets_it).id());
++          validBudget = true;
++          break;
++        }
++        ++budgets_it;
++      }
++    }
++    
+     //if no budget has been selected
+-    if (m_config_f.budget() == "Any" ) {
+-      TQValueList<MyMoneyBudget> budgets = file->budgetList();
++    if (!validBudget ) {
++      
+       TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin();
+       while( budgets_it != budgets.end() ) {
+         //pick the first budget that matches the report start year
+@@ -843,9 +861,6 @@ void PivotTable::calculateBudgetMapping( void )
+ 
+       //assign the budget to the report
+       m_config_f.setBudget(budget.id(), m_config_f.isIncludingBudgetActuals());
+-    } else {
+-      //pick the budget selected by the user
+-      budget = file->budget( m_config_f.budget());
+     }
+ 
+     // Dump the budget
+diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp
+index 8209d3f..e82459a 100644
+--- a/kmymoney2/views/kgloballedgerview.cpp
++++ b/kmymoney2/views/kgloballedgerview.cpp
+@@ -485,7 +485,12 @@ void KGlobalLedgerView::loadView(void)
+             break;
+ 
+           // for all others, we check if the next payment date is still 'in range'
+-          s.setNextDueDate(s.nextPayment(s.nextDueDate()));
++          TQDate nextDueDate = s.nextPayment(s.nextDueDate());
++          if (nextDueDate.isValid()) {
++            s.setNextDueDate(nextDueDate);
++          } else {
++            break;
++          }
+         }
+         scheduleList.pop_front();
+       }
+diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp
+index 60bb173..8745d64 100644
+--- a/kmymoney2/views/khomeview.cpp
++++ b/kmymoney2/views/khomeview.cpp
+@@ -595,6 +595,13 @@ void KHomeView::showPayments(void)
+           schedule.remove(it);
+           continue;
+         }
++        
++        //if nextPayment returns an invalid date, setNextDueDate will just skip it, resulting in a loop
++        //we check the resulting date and erase the schedule if invalid
++        if(!((*it).nextPayment((*it).nextDueDate())).isValid()) {
++          schedule.remove(it);
++          continue;
++        }
+ 
+         (*it).setNextDueDate((*it).nextPayment((*it).nextDueDate()));
+         qBubbleSort(schedule);
+diff --git a/kmymoney2/views/kinstitutionsview.cpp b/kmymoney2/views/kinstitutionsview.cpp
+index 0b9258f..87c0fc1 100644
+--- a/kmymoney2/views/kinstitutionsview.cpp
++++ b/kmymoney2/views/kinstitutionsview.cpp
+@@ -161,6 +161,9 @@ void KInstitutionsView::loadAccounts(void)
+ 
+     // hide it, if unused
+     noInstitutionItem->setVisible(noInstitutionItem->childCount() != 0);
++    
++    bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked()
++      || !KMyMoneyGlobalSettings::hideClosedAccounts();
+ 
+     TQValueList<MyMoneyInstitution> list = file->institutionList();
+     TQValueList<MyMoneyInstitution>::const_iterator it_i;
+@@ -168,6 +171,8 @@ void KInstitutionsView::loadAccounts(void)
+       KMyMoneyAccountTreeItem* item = new KMyMoneyAccountTreeItem(m_accountTree, *it_i);
+       item->setPixmap(0, none.pixmap());
+       loadSubAccounts(item, (*it_i).id());
++      if(!showClosedAccounts)
++        item->setVisible(item->childCount() != 0);
+     }
+ 
+   } catch(MyMoneyException *e) {
+@@ -201,7 +206,8 @@ void KInstitutionsView::loadAccounts(void)
+ 
+ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent)
+ {
+-  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked();
++  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked()
++      || !KMyMoneyGlobalSettings::hideClosedAccounts();
+   const MyMoneyAccount& account = dynamic_cast<const MyMoneyAccount&>(parent->itemObject());
+   TQValueList<TQString>::const_iterator it_a;
+   MyMoneyFile* file = MyMoneyFile::instance();
+@@ -230,7 +236,8 @@ void KInstitutionsView::loadSubAccounts(KMyMoneyAccountTreeItem* parent, const T
+ 
+   TQMap<TQString, MyMoneyAccount>::const_iterator it_a;
+   MyMoneyMoney  value;
+-  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked();
++  bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked()
++      || !KMyMoneyGlobalSettings::hideClosedAccounts();
+ 
+   for(it_a = m_accountMap.begin(); it_a != m_accountMap.end(); ++it_a) {
+     const MyMoneyAccount& acc = *it_a;
+diff --git a/kmymoney2/widgets/stdtransactionmatched.cpp b/kmymoney2/widgets/stdtransactionmatched.cpp
+index 833c88e..9900c3c 100644
+--- a/kmymoney2/widgets/stdtransactionmatched.cpp
++++ b/kmymoney2/widgets/stdtransactionmatched.cpp
+@@ -179,6 +179,8 @@
+                 memo = memo.left(pos);
+                 if(memo.endsWith("\n"))
+                   memo = memo.left(pos-1);
++                // replace all new line characters because we only have one line available for the displayed data
++                memo.replace('\n', " ");
+               }
+             }
+             txt = TQString("%1 %2").tqarg(postDate.toString(Qt::ISODate)).tqarg(memo);
diff --git a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
index db1c114ef..c0af9baf6 100644
--- a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
+++ b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
@@ -1,6 +1,6 @@
 # Default version for this component
 %define kdecomp kmymoney
-%define version 1.0.4
+%define version 1.0.5
 %define release 1
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
@@ -35,7 +35,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0:	%{kdecomp}-3.5.13.tar.gz
 Source1:	kmymoneytitlelabel.png
 Patch0:		kmymoney-3.5.13-recode_ftbfs.patch
-Patch1:		kmymoney-3.5.13-default_money_crash.patch
+
+## TDE Commit: 2a54aa58cfe166f48d6f1395cbc6c9bfd5e31bfc
+Patch1:		kmymoney-3.5.13-lots_of_crash.patch
+
+## TDE Commit: 8654cea10f6902719006d5975db7dc07b2fcc713
+Patch2:		kmymoney-3.5.13-update_to_1.0.5.patch
 
 BuildRequires: tqtinterface-devel
 BuildRequires: trinity-arts-devel
@@ -80,7 +85,8 @@ This package contains development files needed for KMyMoney plugins.
 %prep
 %setup -q -n applications/%{kdecomp}
 %patch0 -p1
-#patch1 -p1
+%patch1 -p1
+%patch2 -p1
 %__install -m644 %{SOURCE1} kmymoney2/widgets/
 
 # Ugly hack to modify TQT include directory inside autoconf files.
@@ -191,9 +197,12 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 %{_libdir}/libkmm_mymoney.la
 %{_libdir}/libkmm_plugin.la
 %{_libdir}/*.so
-%{_usr}/%{_lib}/qt-3.3/plugins/sqldrivers/libsqlite3.lib64.so
+%{_usr}/%{_lib}/qt-3.3/plugins/sqldrivers/libsqlite3*.so
 %{_usr}/%{_lib}/qt-3.3/plugins/designer/libkmymoney.so
 
 %Changelog
+* Sun Jan 15 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.5-1
+- Updates to upstream 1.0.5
+
 * Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
 - Initial release for TDE 3.5.13 on RHEL 6, RHEL 5 and Fedora 15