rpms/seamonkey/devel firefox-2.0.0.4-undo-uriloader.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 seamonkey.spec, 1.19, 1.20 sources, 1.10, 1.11
Kai Engert (kengert)
fedora-extras-commits at redhat.com
Fri Jun 1 01:05:26 UTC 2007
- Previous message: rpms/mash/devel .cvsignore, 1.5, 1.6 mash.spec, 1.4, 1.5 sources, 1.5, 1.6
- Next message: rpms/xfsprogs/devel xfsprogs-2.8.20-fix-type-test.patch, NONE, 1.1 xfsprogs.spec, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kengert
Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22936
Modified Files:
.cvsignore seamonkey.spec sources
Added Files:
firefox-2.0.0.4-undo-uriloader.patch
Log Message:
* Thu May 31 2007 Kai Engert <kengert at redhat.com> 1.1.2-2
- SeaMonkey 1.1.2
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/seamonkey/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 28 Feb 2007 13:19:54 -0000 1.10
+++ .cvsignore 1 Jun 2007 01:04:48 -0000 1.11
@@ -1 +1 @@
-seamonkey-1.1.1.source.tar.bz2
+seamonkey-1.1.2.source.tar.bz2
Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- seamonkey.spec 1 Mar 2007 19:10:53 -0000 1.19
+++ seamonkey.spec 1 Jun 2007 01:04:48 -0000 1.20
@@ -10,7 +10,7 @@
Name: seamonkey
Summary: Web browser, e-mail, news, IRC client, HTML editor
-Version: 1.1.1
+Version: 1.1.2
Release: 2%{?dist}
URL: http://www.mozilla.org/projects/seamonkey/
License: MPL
@@ -34,12 +34,12 @@
Patch2: firefox-2.0-link-layout.patch
Patch21: firefox-0.7.3-default-plugin-less-annoying.patch
Patch22: firefox-0.7.3-psfonts.patch
+Patch41: firefox-2.0.0.4-undo-uriloader.patch
Patch42: firefox-1.1-uriloader.patch
Patch81: firefox-1.5-nopangoxft.patch
Patch83: firefox-1.5-pango-cursor-position.patch
Patch84: firefox-2.0-pango-printing.patch
Patch91: thunderbird-0.7.3-gnome-uriloader.patch
-Patch101: firefox-1.5-embedwindow-visibility.patch
Patch102: firefox-1.5-theme-change.patch
Patch220: seamonkey-fedora-home-page.patch
Patch225: mozilla-nspr-packages.patch
@@ -113,12 +113,12 @@
%patch2 -p1
%patch21 -p1
%patch22 -p1
+%patch41 -p1
%patch42 -p0
%patch81 -p1
%patch83 -p1
%patch84 -p0
%patch91 -p1 -b .gnome-uriloader
-%patch101 -p0 -b .embedwindow-visibility
%patch102 -p0 -b .theme-change
%patch220 -p1
%patch225 -p1
@@ -422,6 +422,8 @@
%changelog
+* Thu May 31 2007 Kai Engert <kengert at redhat.com> 1.1.2-2
+- SeaMonkey 1.1.2
* Wed Feb 28 2007 Kai Engert <kengert at redhat.com> 1.1.1-2
- SeaMonkey 1.1.1
* Wed Feb 07 2007 Kai Engert <kengert at redhat.com> 1.1-2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 28 Feb 2007 13:19:54 -0000 1.10
+++ sources 1 Jun 2007 01:04:48 -0000 1.11
@@ -1 +1 @@
-4409ad62738d403719a62d00c0276e08 seamonkey-1.1.1.source.tar.bz2
+a84742277a3d3036f9d8f55e3b82ac3d seamonkey-1.1.2.source.tar.bz2
- Previous message: rpms/mash/devel .cvsignore, 1.5, 1.6 mash.spec, 1.4, 1.5 sources, 1.5, 1.6
- Next message: rpms/xfsprogs/devel xfsprogs-2.8.20-fix-type-test.patch, NONE, 1.1 xfsprogs.spec, 1.24, 1.25
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list