osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Get Windows build working again. 

Change 16 / g579e7e1 introduced a breaking change in
capture_file_dialog.cpp on Windows. This works around the problem
temporarily until we come up with a proper fix.

Fix a Q_OS_WIN check while we're at it.

Change-Id: I552d60720e4a45c5144e0047ee3c1fcc7e64f4eb
Reviewed-on: https://code.wireshark.org/review/396
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2014-02-25 14:43:04 -08:00
parent a7de0128b1
commit bac680caf5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/qt/capture_file_dialog.cpp
View File

@ -232,6 +232,7 @@ bool CaptureFileDialog::isCompressed() {
}
int CaptureFileDialog::open(QString &file_name, unsigned int &type) {
Q_UNUSED(type) // XXX Remove when type supporte is added to win32_open_file.
GString *fname = g_string_new(file_name.toUtf8().constData());
GString *dfilter = g_string_new(display_filter_.toUtf8().constData());
gboolean wof_status;
@ -239,7 +240,7 @@ int CaptureFileDialog::open(QString &file_name, unsigned int &type) {
// XXX Add a widget->HWND routine to qt_ui_utils and use it instead.
wof_status = win32_open_file((HWND)parentWidget()->effectiveWinId(), fname, dfilter);
file_name = fname->str;
type = format_type_.currentIndex();
//type = format_type_.currentIndex();
display_filter_ = dfilter->str;
g_string_free(fname, TRUE);

2
ui/qt/capture_file_dialog.h
View File

@ -24,7 +24,7 @@
#ifndef CAPTURE_FILE_DIALOG_H
#define CAPTURE_FILE_DIALOG_H
#ifndef Q_QS_WIN
#ifndef Q_OS_WIN
#include "display_filter_edit.h"
#include "packet_range_group_box.h"
#include "ui/help_url.h"