rpms/thunderbird/F-7 firefox-2.0.0.4-undo-uriloader.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.22, 1.23 thunderbird.spec, 1.97, 1.98

Christopher Aillon (caillon) fedora-extras-commits at redhat.com
Fri Jun 8 22:55:11 UTC 2007 

Author: caillon

Update of /cvs/extras/rpms/thunderbird/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22291

Modified Files:
	.cvsignore sources thunderbird.spec 
Added Files:
	firefox-2.0.0.4-undo-uriloader.patch 
Log Message:
* Fri Jun  8 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-0.rc1
- 2.0.0.4 rc1


firefox-2.0.0.4-undo-uriloader.patch:

--- NEW FILE firefox-2.0.0.4-undo-uriloader.patch ---
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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	19 Apr 2007 20:18:10 -0000	1.15
+++ .cvsignore	8 Jun 2007 22:54:37 -0000	1.16
@@ -1,2 +1,2 @@
-thunderbird-2.0.0.0-source.tar.bz2
-thunderbird-langpacks-2.0.0.0-20070419.tar.bz2
+thunderbird-2.0.0.4-source.tar.bz2
+thunderbird-langpacks-2.0.0.4-20070608.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-7/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- sources	19 Apr 2007 20:18:10 -0000	1.22
+++ sources	8 Jun 2007 22:54:37 -0000	1.23
@@ -1,2 +1,2 @@
-8e672d9f9206e0e1f03790dacb51e1bb  thunderbird-2.0.0.0-source.tar.bz2
-b01bb50271b56101a5eea81cb4404b11  thunderbird-langpacks-2.0.0.0-20070419.tar.bz2
+26cdf3e2c8d95421345af8e88ebc9aff  thunderbird-2.0.0.4-source.tar.bz2
+4ed127c8e55b34d6c0085984f3325281  thunderbird-langpacks-2.0.0.4-20070608.tar.bz2


Index: thunderbird.spec
===================================================================
RCS file: /cvs/extras/rpms/thunderbird/F-7/thunderbird.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- thunderbird.spec	19 Apr 2007 20:18:10 -0000	1.97
+++ thunderbird.spec	8 Jun 2007 22:54:37 -0000	1.98
@@ -7,8 +7,8 @@
 
 Summary:	Mozilla Thunderbird mail/newsgroup client
 Name:		thunderbird
-Version:	2.0.0.0
-Release:	1%{?dist}
+Version:	2.0.0.4
+Release:	0.rc1%{?dist}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
 Group:		Applications/Internet
@@ -18,7 +18,7 @@
 %define tarball thunderbird-2.0.0.0rc1-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source1:        thunderbird-langpacks-%{version}-20070419.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20070608.tar.bz2
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
 Source12:       thunderbird-redhat-default-prefs.js
@@ -44,6 +44,7 @@
 
 # local bugfixes
 Patch40:        firefox-1.5-bullet-bill.patch
+Patch41:        firefox-2.0.0.4-undo-uriloader.patch
 Patch42:        firefox-1.1-uriloader.patch
 
 # font system fixes
@@ -116,6 +117,7 @@
 %patch24 -p1 -b .default-applications
 #%patch25 -p0 -b .software-update
 %patch40 -p1
+%patch41 -p1
 %patch42 -p0
 
 # font system fixes
@@ -309,6 +311,9 @@
 #===============================================================================
 
 %changelog
+* Fri Jun  8 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.4-0.rc1
+- 2.0.0.4 rc1
+
 * Thu Apr 19 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.0-1
 - Update to 2.0.0.0 Final

More information about the fedora-extras-commits mailing list