|
Line
Link Here
|
| 0 |
-- /xpcom/io/nsAppFileLocationProvider.cpp |
0 |
++ /xpcom/io/nsAppFileLocationProvider.cpp |
|
Lines 50-55
Link Here
|
| 50 |
# define NS_MACOSX_LOCAL_PLUGIN_DIR "OSXLocalPlugins" |
50 |
# define NS_MACOSX_LOCAL_PLUGIN_DIR "OSXLocalPlugins" |
| 51 |
#elif XP_UNIX |
51 |
#elif XP_UNIX |
| 52 |
# define NS_SYSTEM_PLUGINS_DIR "SysPlugins" |
52 |
# define NS_SYSTEM_PLUGINS_DIR "SysPlugins" |
|
|
53 |
# define NS_SYSTEM_NSBROWSER_PLUGINS_DIR "SysNsBrowserPlugins" |
| 53 |
#endif |
54 |
#endif |
| 54 |
|
55 |
|
| 55 |
#define DEFAULTS_DIR_NAME NS_LITERAL_CSTRING("defaults") |
56 |
#define DEFAULTS_DIR_NAME NS_LITERAL_CSTRING("defaults") |
|
Lines 187-192
Link Here
|
| 187 |
# else |
188 |
# else |
| 188 |
rv = NS_ERROR_FAILURE; |
189 |
rv = NS_ERROR_FAILURE; |
| 189 |
# endif |
190 |
# endif |
|
|
191 |
} else if (nsCRT::strcmp(aProp, NS_SYSTEM_NSBROWSER_PLUGINS_DIR) == 0) { |
| 192 |
# ifdef ENABLE_SYSTEM_EXTENSION_DIRS |
| 193 |
static const char* const sysLPlgDir = |
| 194 |
# if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__) |
| 195 |
"/usr/lib64/nsbrowser/plugins"; |
| 196 |
# elif defined(__OpenBSD__) || defined(__FreeBSD__) |
| 197 |
"/usr/local/lib/nsbrowser/plugins"; |
| 198 |
# else |
| 199 |
"/usr/lib/nsbrowser/plugins"; |
| 200 |
# endif |
| 201 |
rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir), false, |
| 202 |
getter_AddRefs(localFile)); |
| 203 |
# else |
| 204 |
rv = NS_ERROR_FAILURE; |
| 205 |
# endif |
| 190 |
} |
206 |
} |
| 191 |
# endif |
207 |
# endif |
| 192 |
#endif |
208 |
#endif |
|
Lines 501-507
Link Here
|
| 501 |
# ifdef XP_UNIX |
517 |
# ifdef XP_UNIX |
| 502 |
static const char* keys[] = {nullptr, NS_USER_PLUGINS_DIR, |
518 |
static const char* keys[] = {nullptr, NS_USER_PLUGINS_DIR, |
| 503 |
NS_APP_PLUGINS_DIR, NS_SYSTEM_PLUGINS_DIR, |
519 |
NS_APP_PLUGINS_DIR, NS_SYSTEM_PLUGINS_DIR, |
| 504 |
nullptr}; |
520 |
NS_SYSTEM_NSBROWSER_PLUGINS_DIR, nullptr}; |
| 505 |
# else |
521 |
# else |
| 506 |
static const char* keys[] = {nullptr, NS_USER_PLUGINS_DIR, |
522 |
static const char* keys[] = {nullptr, NS_USER_PLUGINS_DIR, |
| 507 |
NS_APP_PLUGINS_DIR, nullptr}; |
523 |
NS_APP_PLUGINS_DIR, nullptr}; |
