Author: beat Date: Tue Jun 29 14:07:00 2010 New Revision: 342 Log: - Add patch to fix startup with certain plugins installed (like lightning 1.0b2)
Obtained from: https://bugzilla.mozilla.org/show_bug.cgi?id=551152 Added: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp trunk/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp Added: branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp Tue Jun 29 14:07:00 2010 (r342) @@ -0,0 +1,23 @@ +--- mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig ++++ mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp +@@ -629,16 +629,17 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile) + NS_ASSERTION(count, "broken search path! bad count"); + for(PRUint32 i = 0; i < count; i++) + { +- nsCOMPtr<nsIFile> current; ++ nsCOMPtr<nsIFile> current, normalized; + aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), + getter_AddRefs(current)); + NS_ASSERTION(current, "broken search path! bad element"); + // nsIFile::Equals basically compares path strings so normalize + // before the comparison. + parent->Normalize(); +- current->Normalize(); ++ current->Clone(getter_AddRefs(normalized)); ++ normalized->Normalize(); + PRBool same; +- if (NS_SUCCEEDED(parent->Equals(current, &same)) && same) ++ if (NS_SUCCEEDED(parent->Equals(normalized, &same)) && same) + return (int) i; + } + } Added: trunk/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptinfo-src-xptiInterfaceInfoManager.cpp Tue Jun 29 14:07:00 2010 (r342) @@ -0,0 +1,23 @@ +--- mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp.orig ++++ mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp +@@ -629,16 +629,17 @@ IndexOfDirectoryOfFile(nsISupportsArray* aSearchPath, nsILocalFile* aFile) + NS_ASSERTION(count, "broken search path! bad count"); + for(PRUint32 i = 0; i < count; i++) + { +- nsCOMPtr<nsIFile> current; ++ nsCOMPtr<nsIFile> current, normalized; + aSearchPath->QueryElementAt(i, NS_GET_IID(nsIFile), + getter_AddRefs(current)); + NS_ASSERTION(current, "broken search path! bad element"); + // nsIFile::Equals basically compares path strings so normalize + // before the comparison. + parent->Normalize(); +- current->Normalize(); ++ current->Clone(getter_AddRefs(normalized)); ++ normalized->Normalize(); + PRBool same; +- if (NS_SUCCEEDED(parent->Equals(current, &same)) && same) ++ if (NS_SUCCEEDED(parent->Equals(normalized, &same)) && same) + return (int) i; + } + } _______________________________________________ freebsd-gecko@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
