Commit graph

290 commits

Author SHA1 Message Date
Michael Tüxen
937df7af18 From Irene Ruengeler: Fix a warning when capturing.
svn path=/trunk/; revision=41897
2012-04-02 17:15:58 +00:00
Anders Broman
e12df043a7 If a comment is cleared, remove it from fdata->opt_comment.
svn path=/trunk/; revision=41895
2012-04-02 15:20:54 +00:00
Anders Broman
a24133d747 Fix a couple of typos and missing return for GTK 3.
svn path=/trunk/; revision=41894
2012-04-02 12:23:33 +00:00
Anders Broman
0c481e3e96 Introduce utility function to ease GTK3 depcrecated funktion removal.
svn path=/trunk/; revision=41893
2012-04-02 11:35:53 +00:00
Michael Tüxen
16421a31cc More whitespace changes...
svn path=/trunk/; revision=41888
2012-04-01 18:16:15 +00:00
Michael Tüxen
fc2377387d Remove waring.
While there: Some whitespace cleanups.

svn path=/trunk/; revision=41887
2012-04-01 17:27:26 +00:00
Anders Broman
ba12caf301 From Cal Turney: IO Graph LOAD inaccuracy, intervals not displayed, wrong frames displayed. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6994
svn path=/trunk/; revision=41883
2012-04-01 16:01:12 +00:00
Anders Broman
653a1bb918 From Martin Kaiser: Fix for main_menubar.c:3874: error: set_menu_visible defined but not used
svn path=/trunk/; revision=41868
2012-03-31 09:22:07 +00:00
Jörg Mayer
6a60fdd5fc gcc 4.7 would complain that the getopt stuff was not declared.
Looks like getopt.h was silently included somewhere in gcc-4.6's
includes. Explicitely include <getopt.h>. No idea whether this
is the correct fix.
Whitespace change: indent includes, if they are inside a conditional.

svn path=/trunk/; revision=41847
2012-03-30 14:55:00 +00:00
Stig Bjørlykke
019008548b Recreate the packet list when changing UAT for header fields.
This fixes a crash when changing settings for fields used as a custom column.

svn path=/trunk/; revision=41840
2012-03-30 08:57:57 +00:00
Jeff Morriss
eb262d2cc2 As pointed out by Alexis: remove a bunch of set-but-unused variables.
svn path=/trunk/; revision=41839
2012-03-30 01:46:42 +00:00
Martin Mathieson
be562947a6 Fix the flag used in a test.
svn path=/trunk/; revision=41835
2012-03-30 00:49:09 +00:00
Martin Mathieson
c8933a43d1 Fix a test to avoid setting an invalid display filter.
Reorder some comments to make things a little clearer.

svn path=/trunk/; revision=41834
2012-03-29 23:12:07 +00:00
Stephen Fisher
0dd6243320 Add newline at end of file to fix compilation error.
svn path=/trunk/; revision=41820
2012-03-28 23:54:50 +00:00
Michael Tüxen
20fdcad8b5 From Irene Ruengeler: Fix a crash.
svn path=/trunk/; revision=41818
2012-03-28 11:54:42 +00:00
Michael Tüxen
0949fc1364 Fix compilation.
svn path=/trunk/; revision=41815
2012-03-28 09:26:47 +00:00
Stig Bjørlykke
6e1194d7ba User data is not used in capture_prepare_cb and capture_do_cb.
svn path=/trunk/; revision=41792
2012-03-27 06:57:21 +00:00
Jeff Morriss
ce8d32d5bb Get things compiling if we HAVE_AIRPCAP.
svn path=/trunk/; revision=41789
2012-03-27 02:30:51 +00:00
Gerald Combs
e19fa8063e Give qmake a VERSION it will accept.
svn path=/trunk/; revision=41762
2012-03-25 21:27:49 +00:00
Gerald Combs
6f5273e81e Fix the Qt build for Win64.
svn path=/trunk/; revision=41761
2012-03-25 19:01:58 +00:00
Jeff Morriss
b338cf8805 Only enable the OK button if we have an address and a name and name resolution
is enabled.

svn path=/trunk/; revision=41748
2012-03-23 03:14:53 +00:00
Jeff Morriss
48b1c7ae5c As I think Guy said a while back (quoting some HIG): anything you can do in a
popup should also be available through a regular menu.  So, make the
"Manually resolve address" function availble in under View->Name Resolution .
(Yes, technically this is an "Edit"-like action, but it just fits so well
under Name Resolution.)

While there, move "Resolve Name" from main_menu_bar_toggle_action_entries[]
into main_menu_bar_entries[] so it doesn't get a (useless) toggle indicator.
(At least as I understand this function, it's supposed to allow you to tell
Wireshark to go off and try to resolve the names in the current frame;
unfortunately it doesn't seem to actually work.)

svn path=/trunk/; revision=41747
2012-03-23 02:37:25 +00:00
Jeff Morriss
9c1bf7223e Don't mark the file as unsaved unless the capture or packet comments actually changed.
svn path=/trunk/; revision=41744
2012-03-23 01:41:59 +00:00
Martin Mathieson
611dcb0d68 When a TCP graph is summoned, work out how many unique TCP conversations
are present. However, still only create the graph for the first/only
one.

LTE MAC or RLC frames often contain multiple SDUs that are segments of
the same TCP conversation - this avoids the need to find a frame with
only one SDU.

svn path=/trunk/; revision=41721
2012-03-21 12:58:50 +00:00
Michael Tüxen
0f92a3a8d2 From Irene Ruengeler: Restore functinality of last patch.
svn path=/trunk/; revision=41719
2012-03-21 09:54:05 +00:00
Guy Harris
7ee4c2fb40 Make the comment I added, saying what scan_local_interfaces() does, more
accurate.

svn path=/trunk/; revision=41713
2012-03-21 06:37:34 +00:00
Guy Harris
7f5162352f scan_local_interfaces() isn't in capture_opts.c; don't declare it in
capture_opts.h.  (It arguably belongs somewhere other than in a file in
ui/gtk, but, if so, move it there, e.g. to something in ui.)

svn path=/trunk/; revision=41712
2012-03-21 06:31:39 +00:00
Guy Harris
4690f02928 Handle bogus values of the error that *should* be coming from
scan_local_interfaces() (but, currently, isn't, as the code wasn't
correctly restructured).

svn path=/trunk/; revision=41710
2012-03-21 06:20:01 +00:00
Guy Harris
40a034b3f5 Fix 4-space tabs.
svn path=/trunk/; revision=41708
2012-03-21 06:10:17 +00:00
Jeff Morriss
1ee4c9e8a0 activate_link_cb() is only defined and used if we have GTK 2.18 or higher; only prototype it when we have GTK 2.18 or higher.
svn path=/trunk/; revision=41701
2012-03-21 02:42:11 +00:00
Jeff Morriss
075491702b welcome_if_tree_load() is static and only called (and prototyped) if we HAVE_LIBPCAP, so don't define the function unless we HAVE_LIBPCAP.
svn path=/trunk/; revision=41698
2012-03-21 01:22:40 +00:00
Guy Harris
4fe63c565d Well, it doesn't recurse with that code there, but it doesn't fill in
the interface list box, either.  Remove the #if 0 for now.

svn path=/trunk/; revision=41696
2012-03-21 00:44:41 +00:00
Guy Harris
7405ba8145 The chimney stuff is Windows-only (not that we shouldn't offer the
ability to turn offloading off on UN*Xes as well...).

svn path=/trunk/; revision=41695
2012-03-21 00:36:44 +00:00
Guy Harris
d43d1c0a6f Recursion, n. See "recursion".
svn path=/trunk/; revision=41694
2012-03-21 00:16:13 +00:00
Guy Harris
b551749d28 welcome_if_tree_load() is not used outside ui/gtk/main_welcome.c; make
it static.

svn path=/trunk/; revision=41693
2012-03-21 00:09:45 +00:00
Guy Harris
e64375d187 #ifdef out some variables used only if we have libpcap.
svn path=/trunk/; revision=41692
2012-03-21 00:01:42 +00:00
Guy Harris
d230d1663f Just put both clear_capture_box() and fill_capture_box() under one
#ifdef HAVE_LIBPCAP/#endif.

svn path=/trunk/; revision=41691
2012-03-20 23:37:23 +00:00
Anders Broman
24298dca48 See if this fixes the OSX build
svn path=/trunk/; revision=41690
2012-03-20 23:03:48 +00:00
Anders Broman
14e0bdf07e See if this fixes the OSX build
svn path=/trunk/; revision=41689
2012-03-20 22:43:44 +00:00
Anders Broman
f246d95f88 make it compile on Windows, \main_welcome.c(1024) : warning C4700: uninitialized local variable 'error' used seems like a logical error, hidden by init to zero. Need proper fix
svn path=/trunk/; revision=41688
2012-03-20 22:40:10 +00:00
Michael Tüxen
26dd77f0af From Irene Ruengeler: Make sure we can remove all interfaces and can
add local interfaces when there are none.
From me: Some whitespace cleanups.

svn path=/trunk/; revision=41687
2012-03-20 21:13:28 +00:00
Guy Harris
ec2451f8f1 We don't use a GENERATED_H_FILES macro anywhere else, we use
GENERATED_HEADER_FILES; get rid of GENERATED_H_FILES in favor of
GENERATED_HEADER_FILES, and make other changes to make the Makefile.am
and Makefile.common in ui/qt more like those in ui/gtk.

svn path=/trunk/; revision=41669
2012-03-19 09:31:22 +00:00
Guy Harris
e0b738f974 Remove the generated-but-not-distributed source files on "make
distclean", as, after all, they're not part of the distribution.

svn path=/trunk/; revision=41668
2012-03-19 09:12:17 +00:00
Guy Harris
28ad4501ee Add main.cpp as an EXTRA_DIST file; for now, we don't build it as part
of the library, because, in order to do the top-level link of Wireshark
with a C++ compiler rather than a C compiler, at least one C++ source
file must be an input file - for now, we don't do that, as adding it as
a top-level source file for Wireshark causes other problems, but this at
least lets somebody do so as a temporary hack to build with auto*.

svn path=/trunk/; revision=41667
2012-03-19 07:32:45 +00:00
Guy Harris
c2f03d39f3 Don't distribute the output of various Qt preprocessing tools. We don't
want to require the machines used to build the distribution tarballs to
have those tools installed or to require the build process to run them,
and I think if you have enough stuff installed to build Qt applications
at all you'll have those tools installed (the reason why the result of
{F}lex and YACC/BYACC/Bison are distributed with tarballs is to let
somebody who wants to or needs to build from unmodified source do so
with as few tools required as possible).

svn path=/trunk/; revision=41666
2012-03-19 07:30:38 +00:00
Guy Harris
df5f0bd622 Another generated file.
svn path=/trunk/; revision=41662
2012-03-19 07:08:15 +00:00
Guy Harris
813ba676a4 Get rid of blank line at the end.
svn path=/trunk/; revision=41660
2012-03-19 06:31:37 +00:00
Guy Harris
a04472a839 Sort the EXTRA_DIST list.
svn path=/trunk/; revision=41659
2012-03-19 06:31:13 +00:00
Guy Harris
1ff3d8477f Call the UI library in the Qt directory libqtui, not libui, to match the
UI library in the GTK+ directory.

List the moc-generated and rcc-generated files as generated files.

Add main_window.ui as an EXTRA_DIST file.  Sort the EXTRA_DIST list.

svn path=/trunk/; revision=41658
2012-03-19 06:29:41 +00:00
Jeff Morriss
13e113bd44 Until someone creates a .vcproj file for QT, don't try to distribute it.
svn path=/trunk/; revision=41655
2012-03-19 01:47:53 +00:00