diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-11-08 09:53:01 +0000 |
| commit | 853da2eb9ba1732b37d3f47319bc94471d9c0e16 (patch) | |
| tree | 94f8afdae71f496fe638550f9e2cea926195b8ee /ui/gtk/drag_and_drop.c | |
| parent | 5cec175b071b85c7cd392350e2fcc246dc20d41d (diff) | |
The "file types" we have are actually combinations of types and
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.
Rename various functions, #defines, and variables appropriately.
svn path=/trunk/; revision=53166
Diffstat (limited to 'ui/gtk/drag_and_drop.c')
| -rw-r--r-- | ui/gtk/drag_and_drop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index cb12955316..93e438a698 100644 --- a/ui/gtk/drag_and_drop.c +++ b/ui/gtk/drag_and_drop.c @@ -215,7 +215,7 @@ dnd_open_file_cmd(gchar *cf_names_freeme) /* merge the files in chronological order */ tmpname = NULL; if (cf_merge_files(&tmpname, in_file_count, in_filenames, - WTAP_FILE_PCAP, FALSE) == CF_OK) { + WTAP_FILE_TYPE_SUBTYPE_PCAP, FALSE) == CF_OK) { /* Merge succeeded; close the currently-open file and try to open the merged capture file. */ cf_close(&cfile); |