[arch-commits] CVS update of extra/network/thunderbird (5 files)

Alexander Baldeck alexander at archlinux.org
Wed Dec 12 11:08:43 EST 2007


    Date: Wednesday, December 12, 2007 @ 11:08:43
  Author: alexander
    Path: /home/cvs-extra/extra/network/thunderbird

   Added: firefox-1.5-bullet-bill.patch (1.1)
          firefox-1.5-theme-change.patch (1.1)
          firefox-2.0.0.4-undo-uriloader.patch (1.1)
Modified: PKGBUILD (1.13 -> 1.14) mozconfig (1.1 -> 1.2)

* addressing more issues


--------------------------------------+
 PKGBUILD                             |   49 +++---
 firefox-1.5-bullet-bill.patch        |   23 ++
 firefox-1.5-theme-change.patch       |  263 +++++++++++++++++++++++++++++++++
 firefox-2.0.0.4-undo-uriloader.patch |   97 ++++++++++++
 mozconfig                            |    2 
 5 files changed, 413 insertions(+), 21 deletions(-)


Index: extra/network/thunderbird/PKGBUILD
diff -u extra/network/thunderbird/PKGBUILD:1.13 extra/network/thunderbird/PKGBUILD:1.14
--- extra/network/thunderbird/PKGBUILD:1.13	Thu Nov 15 10:07:36 2007
+++ extra/network/thunderbird/PKGBUILD	Wed Dec 12 11:08:43 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.13 2007/11/15 15:07:36 alexander Exp $
+# $Id: PKGBUILD,v 1.14 2007/12/12 16:08:43 alexander Exp $
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Dale Blount <dale at archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 pkgname=thunderbird
 pkgver=2.0.0.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL')
@@ -12,8 +12,8 @@
 provides=('mozilla-thunderbird')
 conflicts=('mozilla-thunderbird')
 replaces=('mozilla-thunderbird')
-depends=('gtk2>=2.12.0' 'gcc' 'libidl2' 'mozilla-common' 'nss>=3.11.5' 'libxt')
-makedepends=('zip' 'pkgconfig' 'imagemagick' 'diffutils')
+depends=('gtk2>=2.12.0' 'gcc-libs' 'libidl2' 'mozilla-common' 'nss>=3.11.5' 'libxt')
+makedepends=('zip' 'pkgconfig' 'imagemagick' 'diffutils' 'patch' 'make' 'gcc')
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}-source.tar.bz2
 	mozconfig
         launcher.patch
@@ -26,7 +26,10 @@
         firefox-2.0-pango-ligatures.patch
         firefox-1.5-pango-underline.patch
         firefox-1.5-pango-justified-range.patch
-        firefox-1.5-xft-rangewidth.patch)
+        firefox-1.5-xft-rangewidth.patch
+        firefox-1.5-theme-change.patch
+        firefox-2.0.0.4-undo-uriloader.patch
+        firefox-1.5-bullet-bill.patch)
 options=('!makeflags')
 
 build() {
@@ -40,6 +43,9 @@
   patch -Np1 -i ${startdir}/src/firefox-1.5-pango-underline.patch || return 1
   patch -Np1 -i ${startdir}/src/firefox-1.5-pango-justified-range.patch || return 1
   patch -Np1 -i ${startdir}/src/firefox-1.5-xft-rangewidth.patch || return 1
+  patch -Np0 -i ${startdir}/src/firefox-1.5-theme-change.patch || return 1
+  patch -Np1 -i ${startdir}/src/firefox-2.0.0.4-undo-uriloader.patch || return 1
+  patch -Np1 -i ${startdir}/src/firefox-1.5-bullet-bill.patch || return 1
 
   if [ "${CARCH}" = "x86_64" ]; then
     patch -Np0 -i ${startdir}/src/firefox-visibility.patch || return 1
@@ -52,7 +58,7 @@
   make -f client.mk build || return 1
   make DESTDIR=${startdir}/pkg install || return 1
 
-  cd ${startdir}/pkg/opt/mozilla/lib/thunderbird-${pkgver}
+  cd ${startdir}/pkg/usr/lib/thunderbird-${pkgver}
   export MOZ_DISABLE_GNOME=1
   export MOZTMP=`mktemp -d -p ${startdir}/src`
   LD_LIBRARY_PATH="`pwd`" HOME="${MOZTMP}" ./thunderbird-bin -register
@@ -61,13 +67,13 @@
   find . -maxdepth 1 -type d -exec rm -rf {} \;
 
   # Remove common mozilla aclocal stuff, XULRunner has it
-  rm -rf ${startdir}/pkg/opt/mozilla/share
-  rm -rf ${startdir}/pkg/opt/mozilla/include
-  rm -rf ${startdir}/pkg/opt/mozilla/lib/pkgconfig
+  rm -rf ${startdir}/pkg/usr/share
+  rm -rf ${startdir}/pkg/usr/include
+  rm -rf ${startdir}/pkg/usr/lib/pkgconfig
 
-  cd ${startdir}/pkg/opt/mozilla/lib && ln -sf thunderbird-${pkgver} thunderbird
+  cd ${startdir}/pkg/usr/lib && ln -sf thunderbird-${pkgver} thunderbird
   
-  rm -rf ${startdir}/pkg/opt/mozilla/bin/defaults
+  rm -rf ${startdir}/pkg/usr/bin/defaults
 
   mkdir -p ${startdir}/pkg/usr/share/{applications,pixmaps}
   convert ${startdir}/src/mozilla/mail/app/default.xpm \
@@ -75,23 +81,23 @@
   install -m644 ${startdir}/src/thunderbird.desktop \
       ${startdir}/pkg/usr/share/applications/
 
-  mkdir -p ${startdir}/pkg/opt/mozilla/lib/thunderbird/chrome/icons/default
+  mkdir -p ${startdir}/pkg/usr/lib/thunderbird/chrome/icons/default
   install -m644 ${startdir}/src/mozilla/mail/app/default.xpm \
-      ${startdir}/pkg/opt/mozilla/lib/thunderbird/chrome/icons/default/
+      ${startdir}/pkg/usr/lib/thunderbird/chrome/icons/default/
   install -m644 ${startdir}/src/mozilla/mail/app/default.xpm \
-      ${startdir}/pkg/opt/mozilla/lib/thunderbird/icons/
+      ${startdir}/pkg/usr/lib/thunderbird/icons/
 
   #Move RSS support
-  mv ${startdir}/pkg/opt/mozilla/lib/thunderbird/defaults/isp/* \
-    ${startdir}/pkg/opt/mozilla/lib/thunderbird/isp/
-  rmdir ${startdir}/pkg/opt/mozilla/lib/thunderbird/defaults/isp
+  mv ${startdir}/pkg/usr/lib/thunderbird/defaults/isp/* \
+    ${startdir}/pkg/usr/lib/thunderbird/isp/
+  rmdir ${startdir}/pkg/usr/lib/thunderbird/defaults/isp
 
   #fix #6512
   install -m644 ${startdir}/src/mozilla/dist/bin/chrome/icons/default/*.xpm \
-      ${startdir}/pkg/opt/mozilla/lib/thunderbird/chrome/icons/default/
+      ${startdir}/pkg/usr/lib/thunderbird/chrome/icons/default/
 }
 md5sums=('a6dd74f87dafc7516e7970ecefee046b'
-         '67509a931c144dcb7e4aed4bd0028d7d'
+         '1eb3982e207c79500149db327f868f6a'
          'aaaa941f1a25075d65c60180fb608955'
          'ea4e3c3dee98e3891bef16409551eb6e'
          'bc6f10a06407faee6494acad546aabf9'
@@ -102,4 +108,7 @@
          '505728f57ff903e68afd3abea01be2e4'
          '713a9587dd024f5d03f1fe9c095da9de'
          '4d0713c0a94a367a4e84d5f7e56de631'
-         'affb470ca6bac11a7f3005e2508621a8')
+         'affb470ca6bac11a7f3005e2508621a8'
+         '51681f096254c07149f687fdc4c3c5b7'
+         'd023d8eff67788f7c2adca5b9d388825'
+         '1b16a6b00e88ffd937d7a983753fef67')
Index: extra/network/thunderbird/firefox-1.5-bullet-bill.patch
diff -u /dev/null extra/network/thunderbird/firefox-1.5-bullet-bill.patch:1.1
--- /dev/null	Wed Dec 12 11:08:43 2007
+++ extra/network/thunderbird/firefox-1.5-bullet-bill.patch	Wed Dec 12 11:08:43 2007
@@ -0,0 +1,23 @@
+Index: mozilla/editor/libeditor/text/nsTextEditRules.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/editor/libeditor/text/nsTextEditRules.cpp,v
+retrieving revision 1.195
+diff -d -u -p -r1.195 nsTextEditRules.cpp
+--- mozilla/editor/libeditor/text/nsTextEditRules.cpp	16 Jun 2005 13:10:56 -0000	1.195
++++ mozilla/editor/libeditor/text/nsTextEditRules.cpp	4 Oct 2006 16:02:19 -0000
+@@ -1390,13 +1390,13 @@ nsTextEditRules::EchoInsertionToPWBuff(P
+   // manage the password buffer
+   mPasswordText.Insert(*aOutString, aStart);
+ 
+-  // change the output to '*' only
++  // change the output to 'U+2022' only
+   PRInt32 length = aOutString->Length();
+   PRInt32 i;
+   aOutString->Truncate();
+   for (i=0; i<length; i++)
+   {
+-    aOutString->Append(PRUnichar('*'));
++    aOutString->Append(PRUnichar(0x2022));
+   }
+ 
+   return NS_OK;
Index: extra/network/thunderbird/firefox-1.5-theme-change.patch
diff -u /dev/null extra/network/thunderbird/firefox-1.5-theme-change.patch:1.1
--- /dev/null	Wed Dec 12 11:08:43 2007
+++ extra/network/thunderbird/firefox-1.5-theme-change.patch	Wed Dec 12 11:08:43 2007
@@ -0,0 +1,263 @@
+Index: layout/base/nsPresContext.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/layout/base/nsPresContext.cpp,v
+retrieving revision 3.288.12.2.4.1
+diff -d -u -p -r3.288.12.2.4.1 nsPresContext.cpp
+--- layout/base/nsPresContext.cpp	21 Apr 2006 23:30:50 -0000	3.288.12.2.4.1
++++ layout/base/nsPresContext.cpp	26 Sep 2006 19:26:40 -0000
+@@ -73,6 +73,9 @@
+ #include "nsIDOMDocument.h"
+ #include "nsAutoPtr.h"
+ #include "nsEventStateManager.h"
++#include "nsIEventQueue.h"
++#include "nsIEventQueueService.h"
++
+ #ifdef IBMBIDI
+ #include "nsBidiPresUtils.h"
+ #endif // IBMBIDI
+@@ -267,6 +270,7 @@ nsPresContext::~nsPresContext()
+   NS_IF_RELEASE(mDeviceContext);
+   NS_IF_RELEASE(mLookAndFeel);
+   NS_IF_RELEASE(mLangGroup);
++  NS_IF_RELEASE(mEventQueueService);
+ }
+ 
+ NS_IMPL_ISUPPORTS2(nsPresContext, nsPresContext, nsIObserver)
+@@ -285,6 +289,17 @@ static const char* const kGenericFont[] 
+   ".fantasy."
+ };
+ 
++// Set to true when LookAndFeelChanged needs to be called.  This is used
++// because the look and feel is a service, so there's no need to notify it from
++// more than one prescontext.
++static PRBool sLookAndFeelChanged;
++
++// Set to true when ThemeChanged needs to be called on mTheme.  This is used
++// because mTheme is a service, so there's no need to notify it from more than
++// one prescontext.
++static PRBool sThemeChanged;
++
++
+ void
+ nsPresContext::GetFontPreferences()
+ {
+@@ -709,6 +724,9 @@ nsPresContext::Init(nsIDeviceContext* aD
+                                        this);
+ #endif
+ 
++  rv = CallGetService(NS_EVENTQUEUESERVICE_CONTRACTID, &mEventQueueService);
++  NS_ENSURE_SUCCESS(rv, rv);
++
+   // Initialize our state from the user preferences
+   GetUserPreferences();
+ 
+@@ -1180,33 +1198,126 @@ nsPresContext::GetTheme()
+ void
+ nsPresContext::ThemeChanged()
+ {
++  if (!mPendingThemeChanged) {
++    sLookAndFeelChanged = PR_TRUE;
++    sThemeChanged = PR_TRUE;
++
++    nsCOMPtr<nsIEventQueue> eventQ;
++    mEventQueueService->
++      GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
++                           getter_AddRefs(eventQ));
++    if (!eventQ) {
++      return;
++    }
++
++    PLEvent* evt = new PLEvent();
++    if (!evt) {
++      return;
++    }
++
++    PL_InitEvent(evt, this, nsPresContext::ThemeChangedInternal,
++                 nsPresContext::DestroyThemeChangeEvt);
++
++    // After this point, event destruction will release |this|
++    NS_ADDREF_THIS();
++
++    nsresult rv = eventQ->PostEvent(evt);
++    if (NS_FAILED(rv)) {
++      PL_DestroyEvent(evt);
++    } else {
++      mPendingThemeChanged = PR_TRUE;
++    }
++  }    
++}
++
++void* PR_CALLBACK
++nsPresContext::ThemeChangedInternal(PLEvent *aEvent)
++{
++  nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner);
++
++  pc->mPendingThemeChanged = PR_FALSE;
++
+   // Tell the theme that it changed, so it can flush any handles to stale theme
+   // data.
+-  if (mTheme)
+-    mTheme->ThemeChanged();
++  if (pc->mTheme && sThemeChanged) {
++    pc->mTheme->ThemeChanged();
++    sThemeChanged = PR_FALSE;
++  }
+ 
+   // Clear all cached nsILookAndFeel colors.
+-  if (mLookAndFeel)
+-    mLookAndFeel->LookAndFeelChanged();
++  if (pc->mLookAndFeel && sLookAndFeelChanged) {
++    pc->mLookAndFeel->LookAndFeelChanged();
++    sLookAndFeelChanged = PR_FALSE;
++  }
+ 
+   // We have to clear style data because the assumption of style rule
+   // immutability has been violated since any style rule that uses
+   // system colors or fonts (and probably -moz-appearance as well) has
+   // changed.
+-  nsPresContext::ClearStyleDataAndReflow();
++  pc->ClearStyleDataAndReflow();
++
++  return nsnull;
++}
++
++
++void PR_CALLBACK
++nsPresContext::DestroyThemeChangeEvt(PLEvent* aEvent)
++{
++  nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner);
++  NS_RELEASE(pc);
++  delete aEvent;
+ }
+ 
+ void
+ nsPresContext::SysColorChanged()
+ {
+-  if (mLookAndFeel) {
++  if (!mPendingSysColorChanged) {
++    sLookAndFeelChanged = PR_TRUE;
++
++    nsCOMPtr<nsIEventQueue> eventQ;
++    mEventQueueService->
++      GetSpecialEventQueue(nsIEventQueueService::UI_THREAD_EVENT_QUEUE,
++                           getter_AddRefs(eventQ));
++    if (!eventQ) {
++      return;
++    }
++
++    PLEvent* evt = new PLEvent();
++    if (!evt) {
++      return;
++    }
++
++    PL_InitEvent(evt, this, nsPresContext::SysColorChangedInternal,
++                 nsPresContext::DestroySysColorChangeEvt);
++
++    // After this point, event destruction will release |this|
++    NS_ADDREF_THIS();
++
++    nsresult rv = eventQ->PostEvent(evt);
++    if (NS_FAILED(rv)) {
++      PL_DestroyEvent(evt);
++    } else {
++      mPendingSysColorChanged = PR_TRUE;
++    }
++  }
++}
++
++void* PR_CALLBACK
++nsPresContext::SysColorChangedInternal(PLEvent *aEvent)
++{
++  nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner);
++
++  pc->mPendingSysColorChanged = PR_FALSE;
++  
++  if (pc->mLookAndFeel && sLookAndFeelChanged) {
+      // Don't use the cached values for the system colors
+-    mLookAndFeel->LookAndFeelChanged();
++    pc->mLookAndFeel->LookAndFeelChanged();
++    sLookAndFeelChanged = PR_FALSE;
+   }
+-   
++
+   // Reset default background and foreground colors for the document since
+   // they may be using system colors
+-  GetDocumentColorPreferences();
++  pc->GetDocumentColorPreferences();
+ 
+   // Clear out all of the style data since it may contain RGB values
+   // which originated from system colors.
+@@ -1222,7 +1333,17 @@ nsPresContext::SysColorChanged()
+   // data without reflowing/updating views will lead to incorrect change hints
+   // later, because when generating change hints, any style structs which have
+   // been cleared and not reread are assumed to not be used at all.
+-  ClearStyleDataAndReflow();
++  pc->ClearStyleDataAndReflow();
++
++  return nsnull;
++}
++
++void PR_CALLBACK
++nsPresContext::DestroySysColorChangeEvt(PLEvent* aEvent)
++{
++  nsPresContext* pc = NS_STATIC_CAST(nsPresContext*, aEvent->owner);
++  NS_RELEASE(pc);
++  delete aEvent;
+ }
+ 
+ void
+Index: layout/base/nsPresContext.h
+===================================================================
+RCS file: /cvsroot/mozilla/layout/base/nsPresContext.h,v
+retrieving revision 3.150.4.2
+diff -d -u -p -r3.150.4.2 nsPresContext.h
+--- layout/base/nsPresContext.h	29 Aug 2005 16:15:39 -0000	3.150.4.2
++++ layout/base/nsPresContext.h	26 Sep 2006 19:26:40 -0000
+@@ -56,6 +56,7 @@
+ #include "nsCRT.h"
+ #include "nsIPrintSettings.h"
+ #include "nsPropertyTable.h"
++#include "plevent.h"
+ #ifdef IBMBIDI
+ class nsBidiPresUtils;
+ #endif // IBMBIDI
+@@ -76,6 +77,7 @@ class nsIAtom;
+ class nsIEventStateManager;
+ class nsIURI;
+ class nsILookAndFeel;
++class nsIEventQueueService;
+ class nsICSSPseudoComparator;
+ class nsIAtom;
+ struct nsStyleStruct;
+@@ -627,6 +629,14 @@ public:
+   const nscoord* GetBorderWidthTable() { return mBorderWidthTable; }
+ 
+ protected:
++  static NS_HIDDEN_(void*) PR_CALLBACK ThemeChangedInternal(PLEvent* aEvent);
++  static NS_HIDDEN_(void*) PR_CALLBACK SysColorChangedInternal(PLEvent* aEvent);
++  static NS_HIDDEN_(void) PR_CALLBACK DestroyThemeChangeEvt(PLEvent* aEvent);
++  static NS_HIDDEN_(void) PR_CALLBACK DestroySysColorChangeEvt(PLEvent* aEvent);
++
++  friend void* PR_CALLBACK ThemeChangedInternal(PLEvent* aEvent);
++  friend void* PR_CALLBACK SysColorChangedInternal(PLEvent* aEvent);
++
+   NS_HIDDEN_(void) SetImgAnimations(nsIContent *aParent, PRUint16 aMode);
+   NS_HIDDEN_(void) GetDocumentColorPreferences();
+ 
+@@ -654,6 +664,7 @@ protected:
+                                         // from gfx back to layout.
+   nsIEventStateManager* mEventManager;  // [STRONG]
+   nsILookAndFeel*       mLookAndFeel;   // [STRONG]
++  nsIEventQueueService *mEventQueueService; // [STRONG]
+   nsIAtom*              mMedium;        // initialized by subclass ctors;
+                                         // weak pointer to static atom
+ 
+@@ -724,6 +735,8 @@ protected:
+   unsigned              mCanPaginatedScroll : 1;
+   unsigned              mDoScaledTwips : 1;
+   unsigned              mEnableJapaneseTransform : 1;
++  unsigned              mPendingSysColorChanged : 1;
++  unsigned              mPendingThemeChanged : 1;
+ #ifdef IBMBIDI
+   unsigned              mIsVisual : 1;
+   unsigned              mIsBidiSystem : 1;
Index: extra/network/thunderbird/firefox-2.0.0.4-undo-uriloader.patch
diff -u /dev/null extra/network/thunderbird/firefox-2.0.0.4-undo-uriloader.patch:1.1
--- /dev/null	Wed Dec 12 11:08:43 2007
+++ extra/network/thunderbird/firefox-2.0.0.4-undo-uriloader.patch	Wed Dec 12 11:08:43 2007
@@ -0,0 +1,97 @@
+Index: mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+===================================================================
+RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v
+retrieving revision 1.58.20.1
+retrieving revision 1.58
+diff -d -u -p -r1.58.20.1 -r1.58
+--- mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp	16 Apr 2007 18:54:53 -0000	1.58.20.1
++++ mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp	25 Oct 2004 07:46:01 -0000	1.58
+@@ -1506,8 +1506,13 @@ nsOSHelperAppService::GetFromType(const 
+ 
+   nsDependentSubstring majorType(majorTypeStart, majorTypeEnd);
+   nsDependentSubstring minorType(minorTypeStart, minorTypeEnd);
++  nsAutoString extensions, mime_types_description;
++  LookUpExtensionsAndDescription(majorType,
++                                 minorType,
++                                 extensions,
++                                 mime_types_description);
++
+ 
+-  // First check the user's private mailcap file
+   nsAutoString mailcap_description, handler, mozillaFlags;
+   DoLookUpHandlerAndDescription(majorType,
+                                 minorType,
+@@ -1516,46 +1521,23 @@ nsOSHelperAppService::GetFromType(const 
+                                 mailcap_description,
+                                 mozillaFlags,
+                                 PR_TRUE);
+-  
+-  LOG(("Private Handler/Description results:  handler='%s', description='%s'\n",
+-          NS_LossyConvertUTF16toASCII(handler).get(),
+-          NS_LossyConvertUTF16toASCII(mailcap_description).get()));
+ 
++  
++  if (handler.IsEmpty() && extensions.IsEmpty() &&
++      mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) {
++    // No useful data yet
++    
+ #ifdef MOZ_WIDGET_GTK2
+-  nsMIMEInfoBase *gnomeInfo = nsnull;
+-  if (handler.IsEmpty()) {
+-    // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
+-    // GNOME versions no longer have type-to-extension mappings, so we might
+-    // get back a MIMEInfo without any extensions set.  In that case we'll have
+-    // to look in our mime.types files for the extensions.    
+     LOG(("Looking in GNOME registry\n"));
+-    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
+-    if (gnomeInfo && gnomeInfo->HasExtensions()) {
+-      LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
++    nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
++    if (gnomeInfo) {
++      LOG(("Got MIMEInfo from GNOME registry\n"));
+       return gnomeInfo;
+     }
+-  }
+ #endif
+-
+-  // Now look up our extensions
+-  nsAutoString extensions, mime_types_description;
+-  LookUpExtensionsAndDescription(majorType,
+-                                 minorType,
+-                                 extensions,
+-                                 mime_types_description);
+-
+-#ifdef MOZ_WIDGET_GTK2
+-  if (gnomeInfo) {
+-    LOG(("Got MIMEInfo from GNOME registry without extensions; setting them "
+-         "to %s\n", NS_LossyConvertUTF16toASCII(extensions).get()));
+-
+-    NS_ASSERTION(!gnomeInfo->HasExtensions(), "How'd that happen?");
+-    gnomeInfo->SetFileExtensions(NS_ConvertUTF16toUTF8(extensions));
+-    return gnomeInfo;
+   }
+-#endif
+ 
+-  if (handler.IsEmpty()) {
++  if (handler.IsEmpty() && mailcap_description.IsEmpty()) {
+     DoLookUpHandlerAndDescription(majorType,
+                                   minorType,
+                                   typeOptions,
+@@ -1565,7 +1547,7 @@ nsOSHelperAppService::GetFromType(const 
+                                   PR_FALSE);
+   }
+ 
+-  if (handler.IsEmpty()) {
++  if (handler.IsEmpty() && mailcap_description.IsEmpty()) {
+     DoLookUpHandlerAndDescription(majorType,
+                                   NS_LITERAL_STRING("*"),
+                                   typeOptions,
+@@ -1575,7 +1557,7 @@ nsOSHelperAppService::GetFromType(const 
+                                   PR_TRUE);
+   }
+ 
+-  if (handler.IsEmpty()) {
++  if (handler.IsEmpty() && mailcap_description.IsEmpty()) {
+     DoLookUpHandlerAndDescription(majorType,
+                                   NS_LITERAL_STRING("*"),
+                                   typeOptions,
Index: extra/network/thunderbird/mozconfig
diff -u extra/network/thunderbird/mozconfig:1.1 extra/network/thunderbird/mozconfig:1.2
--- extra/network/thunderbird/mozconfig:1.1	Wed Nov  8 16:02:41 2006
+++ extra/network/thunderbird/mozconfig	Wed Dec 12 11:08:43 2007
@@ -20,4 +20,4 @@
 ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
-ac_add_options --prefix=/opt/mozilla
+ac_add_options --prefix=/usr




More information about the arch-commits mailing list