summaryrefslogtreecommitdiffstats
path: root/thunderbird-default.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2011-04-30 16:08:29 +0200
committerRemi Collet <fedora@famillecollet.com>2011-04-30 16:08:29 +0200
commit729c17e0ad1e9d1d540f2669cbd072a8afc139c2 (patch)
tree0cca2f05cb3fac9367e49bfda39876b031ad9cc6 /thunderbird-default.patch
parent036a7f0c7e7bd2606b048a34f8a12c739ee1c813 (diff)
thunderbird, sync with rawhide, update to 3.1.10
Diffstat (limited to 'thunderbird-default.patch')
-rw-r--r--thunderbird-default.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/thunderbird-default.patch b/thunderbird-default.patch
new file mode 100644
index 0000000..7ab2104
--- /dev/null
+++ b/thunderbird-default.patch
@@ -0,0 +1,34 @@
+diff -up comm-1.9.2/mozilla/browser/components/shell/src/nsGNOMEShellService.cpp.default comm-1.9.2/mozilla/browser/components/shell/src/nsGNOMEShellService.cpp
+--- comm-1.9.2/mozilla/browser/components/shell/src/nsGNOMEShellService.cpp.default 2010-12-07 08:35:33.000000000 -0800
++++ comm-1.9.2/mozilla/browser/components/shell/src/nsGNOMEShellService.cpp 2011-02-07 17:32:42.866343508 -0800
+@@ -104,8 +104,6 @@ static const char kDesktopColorKey[] = D
+ nsresult
+ nsGNOMEShellService::Init()
+ {
+- nsresult rv;
+-
+ // GConf and GnomeVFS _must_ be available, or we do not allow
+ // CreateInstance to succeed.
+
+@@ -120,19 +118,9 @@ nsGNOMEShellService::Init()
+ // the locale encoding. If it's not set, they use UTF-8.
+ mUseLocaleFilenames = PR_GetEnv("G_BROKEN_FILENAMES") != nsnull;
+
+- nsCOMPtr<nsIProperties> dirSvc
+- (do_GetService("@mozilla.org/file/directory_service;1"));
+- NS_ENSURE_TRUE(dirSvc, NS_ERROR_NOT_AVAILABLE);
+-
+- nsCOMPtr<nsILocalFile> appPath;
+- rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile),
+- getter_AddRefs(appPath));
+- NS_ENSURE_SUCCESS(rv, rv);
++ mAppPath.Assign(NS_LITERAL_CSTRING(MOZ_APP_NAME));
+
+- rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME));
+- NS_ENSURE_SUCCESS(rv, rv);
+-
+- return appPath->GetNativePath(mAppPath);
++ return NS_OK;
+ }
+
+ NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)