diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-06-17 21:53:26 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-06-17 21:53:26 +0000 |
| commit | 8649e3f6877c77fb97a77d94a66881a4ae09ab61 (patch) | |
| tree | a56450974f3d35200bc7201abf6c251d1b9aedb8 /gtk/file_dlg.h | |
| parent | 2ee69412dd0a6632040906c471af6aba25aaf478 (diff) | |
add Merge functionality to Ethereal in an experimental state.
Copied and sligthly modified merge.c from mergecap.c
(needs a lot of code cleanup, though)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11171 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/file_dlg.h')
| -rw-r--r-- | gtk/file_dlg.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk/file_dlg.h b/gtk/file_dlg.h index 19594c9c3b..59923ac166 100644 --- a/gtk/file_dlg.h +++ b/gtk/file_dlg.h @@ -1,7 +1,7 @@ /* file_dlg.h * Definitions for dialog boxes for handling files * - * $Id: file_dlg.h,v 1.12 2004/06/04 20:05:30 ulfl Exp $ + * $Id: file_dlg.h,v 1.13 2004/06/17 21:53:25 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -37,6 +37,7 @@ typedef enum { after_save_open_dialog, /**< open the file open dialog */ after_save_open_recent_file, /**< open the specified recent file */ after_save_open_dnd_file, /**< open the specified file from drag and drop */ + after_save_merge_dialog, /**< open the file merge dialog */ after_save_capture_dialog, /**< open the capture dialog */ after_save_exit /**< exit program */ } action_after_save_e; @@ -55,6 +56,13 @@ void file_save_as_cmd(action_after_save_e action_after_save, gpointer action_aft */ void file_open_cmd_cb(GtkWidget *widget, gpointer data); +/** User requested the "Merge" dialog box. + * + * @param widget parent widget + * @param data unused + */ +void file_merge_cmd_cb(GtkWidget *widget, gpointer data); + /** User requested the "Save" dialog box. * * @param widget parent widget |