/[packages]/cauldron/xulrunner/pristine/SOURCES/xulrunner-1.9.1-pluginsdir2.patch
ViewVC logotype

Contents of /cauldron/xulrunner/pristine/SOURCES/xulrunner-1.9.1-pluginsdir2.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 18114 - (show annotations) (download)
Fri Jan 14 23:22:43 2011 UTC (13 years, 3 months ago) by dmorgan
File size: 1440 byte(s)
Copying release 2.0-0.b8.3mdv2011.0 to pristine/ directory.
1 diff -Naur mozilla-1.9.1/xpcom/io/nsAppFileLocationProvider.cpp mozilla-1.9.1.tpg/xpcom/io/nsAppFileLocationProvider.cpp
2 --- mozilla-1.9.1/xpcom/io/nsAppFileLocationProvider.cpp 2009-07-15 15:36:07.000000000 +0000
3 +++ mozilla-1.9.1.tpg/xpcom/io/nsAppFileLocationProvider.cpp 2009-07-25 14:56:12.000000000 +0000
4 @@ -203,6 +203,14 @@
5 if (NS_SUCCEEDED(rv))
6 rv = localFile->AppendRelativeNativePath(PLUGINS_DIR_NAME);
7 }
8 + else if (nsCRT::strcmp(prop, "/usr/lib64/mozilla/plugins") == 0)
9 + {
10 + rv = NS_NewNativeLocalFile(nsDependentCString("/usr/lib64/mozilla/plugins"), PR_TRUE, getter_AddRefs(localFile));
11 + }
12 + else if (nsCRT::strcmp(prop, "/usr/lib/mozilla/plugins") == 0)
13 + {
14 + rv = NS_NewNativeLocalFile(nsDependentCString("/usr/lib/mozilla/plugins"), PR_TRUE, getter_AddRefs(localFile));
15 + }
16 #ifdef XP_MACOSX
17 else if (nsCRT::strcmp(prop, NS_MACOSX_USER_PLUGIN_DIR) == 0)
18 {
19 @@ -593,7 +601,7 @@
20 *_retval = new nsAppDirectoryEnumerator(this, keys);
21 #else
22 #ifdef XP_UNIX
23 - static const char* keys[] = { nsnull, NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, NS_SYSTEM_PLUGINS_DIR, nsnull };
24 + static const char* keys[] = { nsnull, "/usr/lib64/mozilla/plugins", "/usr/lib/mozilla/plugins", NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, nsnull };
25 #else
26 static const char* keys[] = { nsnull, NS_USER_PLUGINS_DIR, NS_APP_PLUGINS_DIR, nsnull };
27 #endif

  ViewVC Help
Powered by ViewVC 1.1.30