diff options
author | Dario Lombardo <lomato@gmail.com> | 2016-12-09 11:46:20 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2016-12-09 15:50:04 +0000 |
commit | 43000acd7429a5870c6b411263c2e4a8342da759 (patch) | |
tree | 336803a8ab024fb87c83e0d1123fe8e527f91250 /ui | |
parent | 8dca05f188712d26efb0e126a00d4ac167a5c8dc (diff) |
ui: move filesystem code to wsutil/filesystem.c
This function can be used by code outside ui (eg. extcap).
Ping-Bug: 13218
Change-Id: Ic11f7acebefeaf777692df044ebff9b1bc387aa3
Reviewed-on: https://code.wireshark.org/review/19178
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/gtk/webbrowser.c | 2 | ||||
-rw-r--r-- | ui/help_url.c | 27 | ||||
-rw-r--r-- | ui/help_url.h | 10 |
3 files changed, 2 insertions, 37 deletions
diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c index c3488fdd75..36e94debf5 100644 --- a/ui/gtk/webbrowser.c +++ b/ui/gtk/webbrowser.c @@ -114,6 +114,8 @@ #include "ui/gtk/webbrowser.h" +#include <wsutil/filesystem.h> + #if defined(G_OS_WIN32) /* Win32 - use Windows shell services to start a browser */ #include <windows.h> diff --git a/ui/help_url.c b/ui/help_url.c index af12f19c9e..059682d976 100644 --- a/ui/help_url.c +++ b/ui/help_url.c @@ -36,33 +36,6 @@ #include <wsutil/unicode-utils.h> #endif -/* - * Given a filename return a filesystem URL. Relative paths are prefixed with - * the datafile directory path. - */ -gchar * -data_file_url(const gchar *filename) -{ - gchar *file_path; - gchar *uri; - - /* Absolute path? */ - if(g_path_is_absolute(filename)) { - file_path = g_strdup(filename); - } else if(running_in_build_directory()) { - file_path = g_strdup_printf("%s/doc/%s", get_datafile_dir(), filename); - } else { - file_path = g_strdup_printf("%s/%s", get_datafile_dir(), filename); - } - - /* XXX - check, if the file is really existing, otherwise display a simple_dialog about the problem */ - - /* convert filename to uri */ - uri = g_filename_to_uri(file_path, NULL, NULL); - g_free(file_path); - return uri; -} - const char * topic_online_url(topic_action_e action) { diff --git a/ui/help_url.h b/ui/help_url.h index 213ef65fb8..d75898d762 100644 --- a/ui/help_url.h +++ b/ui/help_url.h @@ -124,16 +124,6 @@ typedef enum { HELP_TELEPHONY_RTP_PLAYER_DIALOG } topic_action_e; -/** Given a filename return a filesystem URL. Relative paths are prefixed with - * the datafile directory path. - * - * @param filename A file name or path. Relative paths will be prefixed with - * the data file directory path. - * @return A filesystem URL for the file or NULL on failure. A non-NULL return - * value must be freed with g_free(). - */ -gchar *data_file_url(const gchar *filename); - /** Given a topic action return its online (www.wireshark.org) URL or NULL. * * @param action Topic action, e.g. ONLINEPAGE_HOME or ONLINEPAGE_ASK. |