matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trivial Branch Merge

Browse Source
This commit is contained in:
Srivats P. 2011-05-08 17:22:08 +05:30
commit 0b049120f6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/portswindow.cpp
View File

@ -521,8 +521,9 @@ void PortsWindow::on_actionSave_Streams_triggered()
QFileDialog::Options options; QFileDialog::Options options;
// On Mac OS with Native Dialog, getSaveFileName() ignores fileType // On Mac OS with Native Dialog, getSaveFileName() ignores fileType
// which we need. // which we need.On some Linux distros the native dialog can't
#ifdef Q_OS_MAC // distinguish between Ostinato(*) and PCAP(*)
#if defined(Q_OS_MAC) || defined(Q_OS_UNIX)
options |= QFileDialog::DontUseNativeDialog; options |= QFileDialog::DontUseNativeDialog;
#endif #endif

1
common/protocol.proto
View File

@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
*/ */
package OstProto; package OstProto;
option cc_generic_services = true;
message StreamId { message StreamId {
required uint32 id = 1; required uint32 id = 1;