diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2017-09-18 16:25:20 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2017-09-20 16:41:21 +0000 |
| commit | 25ba538bc50ff3a824185cca532f4e0feb4f8ec4 (patch) | |
| tree | c2df4d54627a48815479f168900f195156e20f37 /wsutil/filesystem.h | |
| parent | f1501b82a7354de76a8d3833db2aa8fa8b9d62e0 (diff) | |
plugins: Be more descriptive in "about wireshark"->"folders"
Display separate entries for binary plugins and lua scripts.
This is explained in the user guide, that the binary folder is
a subfolder of the lua folder, but it's probably a good idea to be more
explicit about it, at the risk of cluttering the interface a bit.
Move GeoIP information down because it seems the least important.
Add helper functions to provide plugin version subdir.
Change some #ifdefs while at it for legibility.
Change-Id: Ieb8665df029b3c14de19e2c973bd9b1cc4ec4621
Reviewed-on: https://code.wireshark.org/review/23609
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wsutil/filesystem.h')
| -rw-r--r-- | wsutil/filesystem.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/wsutil/filesystem.h b/wsutil/filesystem.h index 9357a437ad..18f6f19913 100644 --- a/wsutil/filesystem.h +++ b/wsutil/filesystem.h @@ -56,11 +56,21 @@ WS_DLL_PUBLIC const char *get_progfile_dir(void); WS_DLL_PUBLIC const char *get_plugins_dir(void); /* + * Append VERSION_MAJOR.VERSION_MINOR to the plugin dir. + */ +WS_DLL_PUBLIC const char *get_plugins_dir_with_version(void); + +/* * Get the personal plugin dir. */ WS_DLL_PUBLIC const char *get_plugins_pers_dir(void); /* + * Append VERSION_MAJOR.VERSION_MINOR to the plugin personal dir. + */ +WS_DLL_PUBLIC const char *get_plugins_pers_dir_with_version(void); + +/* * Get the directory in which extcap hooks are stored; this must not be called * before init_progfile_dir() is called, as they might be stored in a * subdirectory of the program file directory. |