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/plugins.c | |
| 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/plugins.c')
| -rw-r--r-- | wsutil/plugins.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/wsutil/plugins.c b/wsutil/plugins.c index 6febafbf07..479b8b7c23 100644 --- a/wsutil/plugins.c +++ b/wsutil/plugins.c @@ -341,10 +341,7 @@ scan_plugins(plugin_load_failure_mode mode) } else { - plugin_dir_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%d.%d", - get_plugins_dir(), VERSION_MAJOR, VERSION_MINOR); - plugins_scan_dir(plugin_dir_path, mode); - g_free(plugin_dir_path); + plugins_scan_dir(get_plugins_dir_with_version(), mode); } /* @@ -357,10 +354,7 @@ scan_plugins(plugin_load_failure_mode mode) */ if (!started_with_special_privs()) { - plugin_dir_path = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%d.%d", - get_plugins_pers_dir(), VERSION_MAJOR, VERSION_MINOR); - plugins_scan_dir(plugin_dir_path, mode); - g_free(plugin_dir_path); + plugins_scan_dir(get_plugins_pers_dir_with_version(), mode); } } } |