--- a/ChangeLog	Mon Mar 29 03:54:07 2010 +0000
+++ b/ChangeLog	Mon Mar 29 06:20:40 2010 +0000
@@ -1,3 +1,9 @@
+2010-03-29  Ginn Chen  <[email protected]>
+
+	Revert the fix of d.o.o 15332
+	* base-specs/thunderbird.spec:
+	* patches/thunderbird3-30-set-default-mail-client.diff:
+
 2010-03-29  Halton Huo  <[email protected]>
 
 	* base-specs/gdm.spec: reorder set-console.diff to -25

--- a/base-specs/thunderbird.spec	Mon Mar 29 03:54:07 2010 +0000
+++ b/base-specs/thunderbird.spec	Mon Mar 29 06:20:40 2010 +0000
@@ -98,9 +98,6 @@
 # owner:hawklu date:2009-12-31 type:bug bugzilla:534588
 Patch29: thunderbird3-29-account-setup.diff
 
-# owner:hawklu date:2010-03-26 type:bug d.o.o:15332
-Patch30: thunderbird3-30-set-default-mail-client.diff
-
 URL:         http://www.sun.com/software/javadesktopsystem/
 
 BuildRoot:   %{_tmppath}/%{name}-%{tarball_version}-build
@@ -163,7 +160,6 @@
 %patch26 -p1
 %patch28 -p1
 %patch29 -p1
-%patch30 -p1
 
 
 #####################################
@@ -273,8 +269,6 @@
 /bin/rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Fri Mar 26 2010 - [email protected]
-- Fix bug d.o.o 15332
 * Wed Mar 10 2010 - [email protected]
 - Add $ORIGIN to --with-rpath
 * Tue Mar 09 2010 - [email protected]

--- a/patches/thunderbird3-30-set-default-mail-client.diff	Mon Mar 29 03:54:07 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- comm-1.9.1/mail/components/shell/nsMailGNOMEIntegration.cpp.old	2010-03-26 11:07:31.083225184 +0800
-+++ comm-1.9.1/mail/components/shell/nsMailGNOMEIntegration.cpp	2010-03-26 11:07:46.584575796 +0800
-@@ -222,7 +222,7 @@
- {
-   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
-   nsCAutoString appKeyValue(mAppPath);
--  appKeyValue.AppendLiteral(" \"%s\"");
-+  appKeyValue.AppendLiteral(" %s");
- 
-   for (unsigned int i = 0; i < aLength; ++i) {
-     nsresult rv = gconf->SetAppForProtocol(nsDependentCString(aProtocols[i]),