Packman Build Service PMBS

Changes of Revision 26

aMule.spec Changed

update.diff.xz Changed

@@ -1,10 +1,10 @@
 diff --git a/.svn-revision b/.svn-revision
-index ca56113..af198bb 100644
+index ca56113..d7703a6 100644
 --- a/.svn-revision
 +++ b/.svn-revision
 @@ -1 +1 @@
 -10865
-+10869
++10870
 diff --git a/configure b/configure
 index ae0a1bc..990a088 100755
 --- a/configure
@@ -83,6 +83,33 @@
  
  	Stu Redman:
  		* Display hashing progress in progress bars
+diff --git a/src/KnownFile.cpp b/src/KnownFile.cpp
+index 7960806..0e39630 100644
+--- a/src/KnownFile.cpp
++++ b/src/KnownFile.cpp
+@@ -613,7 +613,9 @@ bool CKnownFile::LoadTagsFromFile(const CFileDataIO* file)
+ 				break;
+ 
+ 			case FT_PERMISSIONS:
+-				// Ignore it, it's not used anymore.
++			case FT_KADLASTPUBLISHKEY:
++			case FT_PARTFILENAME:
++				// Old tags, not used anymore. Just purge them.
+ 				break;
+ 
+ 			case FT_AICH_HASH: {
+@@ -640,11 +642,6 @@ bool CKnownFile::LoadTagsFromFile(const CFileDataIO* file)
+ 				SetLastPublishTimeKadNotes( newtag.GetInt() );
+ 				break;
+ 
+-			case FT_KADLASTPUBLISHKEY:
+-				// Just purge it
+-				wxASSERT( newtag.IsInt() );
+-				break;
+-
+ 			default:
+ 				// Store them here and write them back on saving.
+ 				m_taglist.push_back(newtag);
 diff --git a/src/MD4Hash.h b/src/MD4Hash.h
 index 068f1e1..4c91449 100644
 --- a/src/MD4Hash.h
@@ -115,6 +142,44 @@
  	~CMD4Hash() {
  	}
  
+diff --git a/src/PartFile.cpp b/src/PartFile.cpp
+index 7f302a5..fe49f72 100644
+--- a/src/PartFile.cpp
++++ b/src/PartFile.cpp
+@@ -281,9 +281,6 @@ void CPartFile::CreatePartFile()
+ 
+ 	m_CorruptionBlackBox->SetPartFileInfo(GetFileName().GetPrintable(), m_partmetfilename.RemoveAllExt().GetPrintable());
+ 
+-	wxString strPartName = m_partmetfilename.RemoveExt().GetRaw();
+-	m_taglist.push_back(CTagString(FT_PARTFILENAME, strPartName ));
+-
+ 	m_gaplist.Init(GetFileSize(), true);	// Init empty
+ 
+ 	m_PartPath = m_fullname.RemoveExt();
+@@ -485,6 +482,7 @@ uint8 CPartFile::LoadPartFile(const CPath& in_directory, const CPath& filename,
+ 					// old tags: as long as they are not needed, take the chance to purge them
+ 					case FT_PERMISSIONS:
+ 					case FT_KADLASTPUBLISHKEY:
++					case FT_PARTFILENAME:
+ 						break;
+ 					case FT_DL_ACTIVE_TIME:
+ 						if (newtag.IsInt()) {
+diff --git a/src/SearchFile.cpp b/src/SearchFile.cpp
+index 31c2c41..af6a40d 100644
+--- a/src/SearchFile.cpp
++++ b/src/SearchFile.cpp
+@@ -82,6 +82,11 @@ CSearchFile::CSearchFile(const CMemFile& data, bool optUTF8, wxUIntPtr searchID,
+ 			case FT_COMPLETE_SOURCES:
+ 				m_completeSourceCount = tag.GetInt();
+ 				break;
++			case FT_PERMISSIONS:
++			case FT_KADLASTPUBLISHKEY:
++			case FT_PARTFILENAME:
++				// Just ignore
++				break;
+ 			default:
+ 				AddTagUnique(tag);
+ 		}
 diff --git a/src/utils/fileview/FileView.cpp b/src/utils/fileview/FileView.cpp
 index 62ee4df..0c8c985 100644
 --- a/src/utils/fileview/FileView.cpp