diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-03-19 19:40:53 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-03-19 18:42:31 +0000 |
| commit | 0f51f78608c90d00a6f4cda599b1df26bad4b8d5 (patch) | |
| tree | bba355997e6d4ec48b00e92d79e2a06c8b9e6cee /wsutil | |
| parent | 5b7ad8278ac70ffb26ca12960dfe45ba4cab8368 (diff) | |
| download | wireshark-0f51f78608c90d00a6f4cda599b1df26bad4b8d5.tar.gz | |
The 1.11.x installer puts the global plugins in the wrong place [Mac OS X]
Issue found by rols
Fix comment and use the correct plugin_dir path (missing wireshark folder)
Change-Id: I298bc5e9872d8c20c5baeaaf056262b9668f15bf
Closed-bug: 9854
Reviewed-on: https://code.wireshark.org/review/745
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/filesystem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wsutil/filesystem.c b/wsutil/filesystem.c index 07610cee01..1a316e2379 100644 --- a/wsutil/filesystem.c +++ b/wsutil/filesystem.c @@ -1140,7 +1140,7 @@ init_plugin_dir(void) #ifdef __APPLE__ /* * If we're running from an app bundle and weren't started - * with special privileges, use the Contents/Resources/lib/wireshark/plugins + * with special privileges, use the Contents/PlugIns/wireshark * subdirectory of the app bundle. * * (appbundle_dir is not set to a non-null value if we're @@ -1148,7 +1148,7 @@ init_plugin_dir(void) * it; we don't need to call started_with_special_privs().) */ else if (appbundle_dir != NULL) { - plugin_dir = g_strdup_printf("%s/Contents/PlugIns", + plugin_dir = g_strdup_printf("%s/Contents/PlugIns/wireshark", appbundle_dir); } #endif |