diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-04-04 02:25:01 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-04-09 23:40:51 +0000 |
| commit | ed6eecd79e7b933bccc442589ed3689a646c1256 (patch) | |
| tree | 3bc759a68ea34eb322c4e78679f9a72f84f7fc91 /epan | |
| parent | 320726b83e2096d9431f28208437a738b31d8ad9 (diff) | |
[GTK] Check for xdg-open at run time
Remove HTML_VIEWER compile-time setting.
If xdg-open doesn't exist use user web browser preference as fallback.
Change-Id: I3b4a4a1a36b0192d75f2c97595f37d0d88a0941e
Reviewed-on: https://code.wireshark.org/review/14805
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/prefs.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/epan/prefs.c b/epan/prefs.c index c7d7a2b906..c5865baf9e 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -3100,11 +3100,7 @@ pre_init_prefs(void) prefs.gui_update_channel = UPDATE_CHANNEL_STABLE; prefs.gui_update_interval = 60*60*24; /* Seconds */ if (prefs.gui_webbrowser) g_free(prefs.gui_webbrowser); -#ifdef HTML_VIEWER - prefs.gui_webbrowser = g_strdup(HTML_VIEWER " %s"); -#else prefs.gui_webbrowser = g_strdup(""); -#endif if (prefs.gui_window_title) g_free(prefs.gui_window_title); prefs.gui_window_title = g_strdup(""); if (prefs.gui_prepend_window_title) g_free(prefs.gui_prepend_window_title); |