rev 6743 - in kde-extras/kid3/trunk/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-07-16 19:50:35 +0000 (Mon, 16 Jul 2007)
New Revision: 6743

Added:
   kde-extras/kid3/trunk/debian/patches/kid3-0.9-custom_import_export_format.diff
Modified:
   kde-extras/kid3/trunk/debian/changelog
   kde-extras/kid3/trunk/debian/patches/series
Log:
kid3, pacth fixing 432953.



Modified: kde-extras/kid3/trunk/debian/changelog
===================================================================
--- kde-extras/kid3/trunk/debian/changelog	2007-07-16 18:53:41 UTC (rev 6742)
+++ kde-extras/kid3/trunk/debian/changelog	2007-07-16 19:50:35 UTC (rev 6743)
@@ -1,3 +1,10 @@
+kid3 (0.9-3) unstable; urgency=low
+
+  * Add patch to use custom import/export formats with empty fields.
+   (Closes: #432953)
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 16 Jul 2007 20:58:45 +0200
+
 kid3 (0.9-2) unstable; urgency=low
 
   [ Mark Purcell ]

Added: kde-extras/kid3/trunk/debian/patches/kid3-0.9-custom_import_export_format.diff
===================================================================
--- kde-extras/kid3/trunk/debian/patches/kid3-0.9-custom_import_export_format.diff	                        (rev 0)
+++ kde-extras/kid3/trunk/debian/patches/kid3-0.9-custom_import_export_format.diff	2007-07-16 19:50:35 UTC (rev 6743)
@@ -0,0 +1,29 @@
+--- kid3-0.9.orig/kid3/importconfig.cpp	2007-04-29 00:02:28.000000000 +0200
++++ kid3-0.9/kid3/importconfig.cpp	2007-07-14 11:21:42.000000000 +0200
+@@ -198,6 +198,16 @@
+ 	m_exportFormatIdx = config->readNumEntry("ExportFormatIdx", m_exportFormatIdx);
+ 	m_exportWindowWidth = config->readNumEntry("ExportWindowWidth", -1);
+ 	m_exportWindowHeight = config->readNumEntry("ExportWindowHeight", -1);
++
++	// KConfig seems to strip empty entries from the end of the string lists,
++	// so we have to append them again.
++	unsigned numNames = names.size();
++	while (headers.size() < numNames) headers.append("");
++	while (tracks.size() < numNames) tracks.append("");
++	unsigned numExpNames = expNames.size();
++	while (expHeaders.size() < numExpNames) expHeaders.append("");
++	while (expTracks.size() < numExpNames) expTracks.append("");
++	while (expTrailers.size() < numExpNames) expTrailers.append("");
+ #else
+ 	config->beginGroup("/" + m_group);
+ 	m_importDestV1 = config->readBoolEntry("/ImportDestinationV1", m_importDestV1);
+@@ -256,4 +266,9 @@
+ 			m_exportFormatTrailers.append(*expTrailersIt);
+ 		}
+ 	}
++
++	if (m_importFormatIdx >= static_cast<int>(m_importFormatNames.size()))
++		m_importFormatIdx = 0;
++	if (m_exportFormatIdx >=  static_cast<int>(m_exportFormatNames.size()))
++		m_exportFormatIdx = 0;
+ }

Modified: kde-extras/kid3/trunk/debian/patches/series
===================================================================
--- kde-extras/kid3/trunk/debian/patches/series	2007-07-16 18:53:41 UTC (rev 6742)
+++ kde-extras/kid3/trunk/debian/patches/series	2007-07-16 19:50:35 UTC (rev 6743)
@@ -1,3 +1,4 @@
 kid3-0.9-desktop.diff
 kid3-0.9-kid3-qt-icon.diff
 kid3-0.9-remove_user_actions.diff
+kid3-0.9-custom_import_export_format.diff