diff options
| author | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-09-22 21:14:54 +0000 |
|---|---|---|
| committer | gerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7> | 2006-09-22 21:14:54 +0000 |
| commit | 25e3676115630a99bc427cfcf587be4e212ed7ea (patch) | |
| tree | f003e5ec1c257836dda6c2c807fdb0ecccb60e73 /gtk/help_dlg.c | |
| parent | 1ec9e0db960b0d91317503bfe38d63921a49d310 (diff) | |
Add support for reading from stdin under Windows. Based on a patch sent
in last year by Gianluca Varenni.
Add partial support for reading from named pipes (currently disabled).
Move utf_8to16() and utf_16to8() to a separate module (unicode-utils.[ch])
so that we don't have to cut and paste code in dumpcap.c.
Fix up whitespace.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19291 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/help_dlg.c')
| -rw-r--r-- | gtk/help_dlg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c index ee4582bb1b..3ce011f773 100644 --- a/gtk/help_dlg.c +++ b/gtk/help_dlg.c @@ -47,7 +47,7 @@ #ifdef HHC_DIR #include <windows.h> #include <htmlhelp.h> -#include "epan/strutil.h" +#include "epan/unicode-utils.h" #endif @@ -234,12 +234,12 @@ static void help_topic(const gchar *topic) { HWND hw; GString *url = g_string_new(""); - g_string_append_printf(url, "%s\\user-guide.chm::/%s>Wireshark Help", + g_string_append_printf(url, "%s\\user-guide.chm::/%s>Wireshark Help", get_datafile_dir(), topic); - hw = HtmlHelpW(NULL, - utf_8to16(url->str), - HH_DISPLAY_TOPIC, 0); + hw = HtmlHelpW(NULL, + utf_8to16(url->str), + HH_DISPLAY_TOPIC, 0); if(hw == NULL) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "Could not open help file: %s\\user-guide.chm", @@ -492,13 +492,13 @@ topic_action(topic_action_e action) } -void +void topic_cb(GtkWidget *w _U_, topic_action_e action) { topic_action(action); } -void +void topic_menu_cb(GtkWidget *w _U_, gpointer data _U_, topic_action_e action) { topic_action(action); } |