Attachment #122140 for bug #165262

View | Details | Raw Unified | Return to bug 165262
Collapse All | Expand All

Lines 6-13 Link Here

(-)kmymoney-kde4/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= kmymoney	8	PORTNAME= kmymoney
9	PORTVERSION= 4.6.1	9	PORTVERSION= 4.6.2
10	PORTREVISION= 2
11	CATEGORIES= finance kde	10	CATEGORIES= finance kde
12	MASTER_SITES= SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}	11	MASTER_SITES= SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}
13		12

Lines 1-2 Link Here

(-)kmymoney-kde4/distinfo (-2 / +2 lines)
1	SHA256 (kmymoney-4.6.1.tar.bz2) = 5fcab9c4f1b5868aabb816a87c61cb025e69a191f6cb218cce3f29f0c1c1b77a	1	SHA256 (kmymoney-4.6.2.tar.bz2) = add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75
2	SIZE (kmymoney-4.6.1.tar.bz2) = 22758086	2	SIZE (kmymoney-4.6.2.tar.bz2) = 22762330




--- ./kmymoney/converter/mymoneygncreader.cpp.orig	2011-11-05 05:20:14.000000000 -0400
+++ ./kmymoney/converter/mymoneygncreader.cpp	2012-01-17 04:21:49.000000000 -0500
@@ -1256,7 +1256,6 @@
 #ifndef _GNCFILEANON
 void MyMoneyGncReader::readFile(QIODevice* pDevice, IMyMoneySerialize* storage)
 {
-
   Q_CHECK_PTR(pDevice);
   Q_CHECK_PTR(storage);
 
@@ -1270,6 +1269,8 @@
   MyMoneyFile::instance()->attachStorage(m_storage);
   MyMoneyFileTransaction ft;
   m_xr = new XmlReader(this);
+  bool blocked = MyMoneyFile::instance()->signalsBlocked();
+  MyMoneyFile::instance()->blockSignals(true);
   try {
     m_xr->processFile(pDevice);
     terminate();  // do all the wind-up things
@@ -1278,11 +1279,11 @@
     KMessageBox::error(0, i18n("Import failed:\n\n%1", e->what()), PACKAGE);
     qWarning("%s", qPrintable(e->what()));
   } // end catch
+  MyMoneyFile::instance()->blockSignals(blocked);
   MyMoneyFile::instance()->detachStorage(m_storage);
   signalProgress(0, 1, i18n("Import complete"));  // switch off progress bar
   delete m_xr;
   qDebug("Exiting gnucash importer");
-  return;
 }
 #else
 // Control code for the file anonymizer

Lines 415-422 Link Here

(-)kmymoney-kde4/pkg-plist (-5 / +13 lines)
415	share/apps/kmymoney/misc/financequote.pl	415	share/apps/kmymoney/misc/financequote.pl
416	share/apps/kmymoney/pics/l10n/de/startlogo.png	416	share/apps/kmymoney/pics/l10n/de/startlogo.png
417	share/apps/kmymoney/pics/l10n/es/startlogo.png	417	share/apps/kmymoney/pics/l10n/es/startlogo.png
		418	share/apps/kmymoney/pics/l10n/hu/startlogo.png
		419	share/apps/kmymoney/pics/l10n/it/startlogo.png
		420	share/apps/kmymoney/pics/l10n/pt_BR/startlogo.png
418	share/apps/kmymoney/pics/l10n/ro/startlogo.png	421	share/apps/kmymoney/pics/l10n/ro/startlogo.png
419	share/apps/kmymoney/pics/l10n/ru/startlogo.png	422	share/apps/kmymoney/pics/l10n/ru/startlogo.png
		423	share/apps/kmymoney/pics/l10n/sv/startlogo.png
420	share/apps/kmymoney/pics/l10n/uk/startlogo.png	424	share/apps/kmymoney/pics/l10n/uk/startlogo.png
421	share/apps/kmymoney/pics/startlogo.png	425	share/apps/kmymoney/pics/startlogo.png
422	share/apps/kmymoney/pics/titlelabel_background.png	426	share/apps/kmymoney/pics/titlelabel_background.png
Lines 811-821 Link Here
811	share/doc/HTML/en/kmymoney/accwiz2.png	815	share/doc/HTML/en/kmymoney/accwiz2.png
812	share/doc/HTML/en/kmymoney/accwiz6.png	816	share/doc/HTML/en/kmymoney/accwiz6.png
813	share/doc/HTML/en/kmymoney/accwiz7.png	817	share/doc/HTML/en/kmymoney/accwiz7.png
814	share/doc/HTML/en/kmymoney/accwiz8.1.png	818	share/doc/HTML/en/kmymoney/accwiz8_1.png
815	share/doc/HTML/en/kmymoney/accwiz8.2.png	819	share/doc/HTML/en/kmymoney/accwiz8_2.png
816	share/doc/HTML/en/kmymoney/accwiz8.3.png	820	share/doc/HTML/en/kmymoney/accwiz8_3.png
817	share/doc/HTML/en/kmymoney/accwiz8.4.png	821	share/doc/HTML/en/kmymoney/accwiz8_4.png
818	share/doc/HTML/en/kmymoney/accwiz8.5.png	822	share/doc/HTML/en/kmymoney/accwiz8_5.png
819	share/doc/HTML/en/kmymoney/accwiz9.png	823	share/doc/HTML/en/kmymoney/accwiz9.png
820	share/doc/HTML/en/kmymoney/budgets_view.png	824	share/doc/HTML/en/kmymoney/budgets_view.png
821	share/doc/HTML/en/kmymoney/calendarview.png	825	share/doc/HTML/en/kmymoney/calendarview.png
Lines 1341-1348 Link Here
1341	@dirrm share/apps/kmymoney/templates/C	1345	@dirrm share/apps/kmymoney/templates/C
1342	@dirrm share/apps/kmymoney/templates	1346	@dirrm share/apps/kmymoney/templates
1343	@dirrm share/apps/kmymoney/pics/l10n/uk	1347	@dirrm share/apps/kmymoney/pics/l10n/uk
		1348	@dirrm share/apps/kmymoney/pics/l10n/sv
1344	@dirrm share/apps/kmymoney/pics/l10n/ru	1349	@dirrm share/apps/kmymoney/pics/l10n/ru
1345	@dirrm share/apps/kmymoney/pics/l10n/ro	1350	@dirrm share/apps/kmymoney/pics/l10n/ro
		1351	@dirrm share/apps/kmymoney/pics/l10n/pt_BR
		1352	@dirrm share/apps/kmymoney/pics/l10n/it
		1353	@dirrm share/apps/kmymoney/pics/l10n/hu
1346	@dirrm share/apps/kmymoney/pics/l10n/es	1354	@dirrm share/apps/kmymoney/pics/l10n/es
1347	@dirrm share/apps/kmymoney/pics/l10n/de	1355	@dirrm share/apps/kmymoney/pics/l10n/de
1348	@dirrm share/apps/kmymoney/pics/l10n	1356	@dirrm share/apps/kmymoney/pics/l10n

Return to bug 165262

Lines 1-32 Link Here

(-)kmymoney-kde4/files/patch-kmymoney__converter__mymoneygncreader.cpp (-32 lines)
1	--- ./kmymoney/converter/mymoneygncreader.cpp.orig 2011-11-05 05:20:14.000000000 -0400
2	+++ ./kmymoney/converter/mymoneygncreader.cpp 2012-01-17 04:21:49.000000000 -0500
3	@@ -1256,7 +1256,6 @@
4	#ifndef _GNCFILEANON
5	void MyMoneyGncReader::readFile(QIODevice* pDevice, IMyMoneySerialize* storage)
6	{
7	-
8	Q_CHECK_PTR(pDevice);
9	Q_CHECK_PTR(storage);
10
11	@@ -1270,6 +1269,8 @@
12	MyMoneyFile::instance()->attachStorage(m_storage);
13	MyMoneyFileTransaction ft;
14	m_xr = new XmlReader(this);
15	+ bool blocked = MyMoneyFile::instance()->signalsBlocked();
16	+ MyMoneyFile::instance()->blockSignals(true);
17	try {
18	m_xr->processFile(pDevice);
19	terminate(); // do all the wind-up things
20	@@ -1278,11 +1279,11 @@
21	KMessageBox::error(0, i18n("Import failed:\n\n%1", e->what()), PACKAGE);
22	qWarning("%s", qPrintable(e->what()));
23	} // end catch
24	+ MyMoneyFile::instance()->blockSignals(blocked);
25	MyMoneyFile::instance()->detachStorage(m_storage);
26	signalProgress(0, 1, i18n("Import complete")); // switch off progress bar
27	delete m_xr;
28	qDebug("Exiting gnucash importer");
29	- return;
30	}
31	#else
32	// Control code for the file anonymizer