From owner-freebsd-gecko@FreeBSD.ORG Tue Jun 29 14:07:07 2010 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 39DD2106566C for ; Tue, 29 Jun 2010 14:07:07 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id DA1A48FC18 for ; Tue, 29 Jun 2010 14:07:06 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id o5TE75d2089896 for ; Tue, 29 Jun 2010 14:07:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id o5TE70A9089437 for freebsd-gecko@freebsd.org; Tue, 29 Jun 2010 14:07:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 29 Jun 2010 14:07:00 GMT Message-Id: <201006291407.o5TE70A9089437@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r342 - branches/experimental/mail/thunderbird/files trunk/mail/thunderbird/files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Jun 2010 14:07:07 -0000 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 current; ++ nsCOMPtr 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 current; ++ nsCOMPtr 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; + } + }