Commit Graph

40913 Commits

Author SHA1 Message Date
Guy Harris 00de07144d Use the modal version of the bad display filter alert box in the I/O
statistics window.

Get rid of the non-modal version (it's not being used any more), and
remove the now-redundant _modal from the modal version.

svn path=/trunk/; revision=43081
2012-06-04 20:08:59 +00:00
Guy Harris 91b777712a Use the modal bad display filter alert dialog.
svn path=/trunk/; revision=43080
2012-06-04 19:58:54 +00:00
Guy Harris 495cfc2d89 Clean up indentation.
svn path=/trunk/; revision=43079
2012-06-04 19:45:44 +00:00
Guy Harris 7453e28dc0 Use the modal version of the bad display filter alert box.
svn path=/trunk/; revision=43078
2012-06-04 19:44:48 +00:00
Guy Harris 5caadafaca And do the same with the color filter import and export dialogs (which
really don't belong here - they have nothing to do with capture files).

Absorb the test for the target file's existence into
file_target_exist_ui().

svn path=/trunk/; revision=43077
2012-06-04 19:37:04 +00:00
Guy Harris 0955936403 And do the same with the merge dialog.
svn path=/trunk/; revision=43076
2012-06-04 19:04:45 +00:00
Guy Harris 8ba4fe2413 Clean up indentation.
svn path=/trunk/; revision=43075
2012-06-04 18:41:36 +00:00
Guy Harris 1899e6ee34 Do with the open dialog what we've done with the save and "export
selected packets" dialog.

svn path=/trunk/; revision=43074
2012-06-04 18:40:45 +00:00
Gerald Combs a0c9661fa5 There doesn't appear to be a way to convey the message "This library is
under development. Maybe you should use a stable version." via the
version number. Use the next best thing and set each number to zero.

svn path=/trunk/; revision=43073
2012-06-04 18:33:21 +00:00
Guy Harris f7b2ed3799 file_target_exist_ui() is used only on UN*Xes; on Win32, we'd use the
Windows file dialog, which has its own built-in version of the "do you
want to overwrite that file?" dialog, and Notepad and WordPad, at least,
just appear to error out if you try to overwrite a file with the
read-only flag set, rather than asking whether you want to override
that.

svn path=/trunk/; revision=43072
2012-06-04 17:21:32 +00:00
Anders Broman 94627901a9 Update GTK 3.0 package Id
svn path=/trunk/; revision=43071
2012-06-04 16:56:08 +00:00
Gerald Combs ec41a42abe There's no sense in making everyone check out a large, old list of
changes.

svn path=/trunk/; revision=43070
2012-06-04 15:36:42 +00:00
Jakub Zawadzki 6fff7c61f0 display filter: restore comparision of fields.
like:
  udp.srcport == udp.dstport
  frame.cap_len != frame.len
(probably you can use it for better ones)

part of bug #7263


svn path=/trunk/; revision=43069
2012-06-04 14:45:50 +00:00
Jakub Zawadzki 11e584f4cf packet-gadu-gadu: set COL_INFO in undissected/unknown packet types.
svn path=/trunk/; revision=43068
2012-06-04 14:37:24 +00:00
Anders Broman a90e1a353a Try to make the buildbot happy.
svn path=/trunk/; revision=43067
2012-06-04 14:31:53 +00:00
Anders Broman b69547925f Get rid of a couple of warnings.
svn path=/trunk/; revision=43066
2012-06-04 13:52:46 +00:00
Anders Broman 2a30b1eff9 Get rid of a couple of warnings.
svn path=/trunk/; revision=43065
2012-06-04 13:21:44 +00:00
Anders Broman a0910557c7 Get rid of a couple of warnings.
svn path=/trunk/; revision=43064
2012-06-04 12:20:37 +00:00
Anders Broman 131334481d Get rid of a couple of warnings.
svn path=/trunk/; revision=43063
2012-06-04 11:44:52 +00:00
Anders Broman 81a7df91dd Revert previous change as it did not compile.
svn path=/trunk/; revision=43062
2012-06-04 11:18:17 +00:00
Anders Broman 920ad0bcee Try to get rid of a couple of warnings.
svn path=/trunk/; revision=43061
2012-06-04 10:36:43 +00:00
Guy Harris afa17a95b0 Make the "Export Selected Packets As..." code path more like the "Save
As..." code path.

Extract the code for the "do you want to overwrite this file" and "OK,
you do - are you aware it's {user-immutable, read-only}?" code paths
into a common routine for use by both of those and, potentially, other
save/export/etc. code paths in the future.

For "Save As", allow us to save atop the current capture file, as that's
just what "Save" does if there are unsaved changes, and "safe save"
makes that work.  *Don't* allow that for "Export Selected Packets
As...", however.

The file chooser is run as a modal dialog, so we don't need to worry
about creating more than one of them or about the number of marked
packets etc. being changed out from under us.  Get rid of a bunch of
static variables.

svn path=/trunk/; revision=43060
2012-06-04 10:27:59 +00:00
Pascal Quantin f275aeadd9 Fix 'lvalue required as left operand of assignment' error when compiling with gcc 4.3.2
svn path=/trunk/; revision=43059
2012-06-04 10:02:08 +00:00
Anders Broman 85972d91c7 Try to get rid of a couple of warnings.
svn path=/trunk/; revision=43058
2012-06-04 09:04:36 +00:00
Anders Broman 10fe76d8a0 Get rid of a couple of warnings.
svn path=/trunk/; revision=43057
2012-06-04 08:56:48 +00:00
Guy Harris ab13375393 Clean up indentation.
svn path=/trunk/; revision=43056
2012-06-04 08:46:51 +00:00
Pascal Quantin ebbaf7f820 From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7325 :
Add support for the Gluster CLI RPC-protocol

svn path=/trunk/; revision=43055
2012-06-04 08:42:12 +00:00
Chris Maynard 4902b4d857 Remove a few of "if (tree)" checks surrounding expert_add_info_format().
svn path=/trunk/; revision=43054
2012-06-04 06:22:50 +00:00
Guy Harris eb03bb0290 Add some more routines to main.c that handle updates to "auto scroll in
live capture" and colorization, so that the ones in main_menubar.c don't
have to know about anything other than the main menubar.

Move some toolbar routines that should only be used by routines in
main.c into a main_toolbar_private.h header.

svn path=/trunk/; revision=43053
2012-06-04 03:15:05 +00:00
Guy Harris 2d4bd31654 We need main.h for main_update_for_unsaved_changes(), regardless of
whether we have pcap or not.

svn path=/trunk/; revision=43052
2012-06-04 03:09:54 +00:00
Guy Harris 9c44d87610 Have a main_update_for_unsaved_changes() routine that, if changes are
made to the capture file (adding/removing/editing comments, for now) or
if a capture file with unsaved changes are unsaved, updates the menu
bar, the toolbar, *and* the titlebar, which now has a GNOME-style "*" to
indicate unsaved changes.

Make set_menus_for_capture_file() a private interface between main.c and
main_menubar.c, and have its callers, such as
main_update_for_unsaved_changes(), be responsible for updating the
toolbar as well.

svn path=/trunk/; revision=43051
2012-06-04 02:24:42 +00:00
Bill Meier bcfbbd6f1e From René Scheibe:
"
I just noticed when upgrading from 1.2.15 to 1.6.8 that the file
dictionary.3gpp now contains an invalid entry. There is a typo (3GGP
instead of 3GPP) and the decoding is incorrect too.

wireshark:
ATTRIBUTE   3GGP-IMEISV   20   octets

freeradius:
ATTRIBUTE   3GPP-IMEISV   20   string
"

http://www.wireshark.org/lists/wireshark-dev/201206/msg00021.html


svn path=/trunk/; revision=43050
2012-06-04 01:09:56 +00:00
Guy Harris 624b3f6d19 set_file_type_list() uses two items from the capture_file structure;
just pass it a pointer to a capture_file structure and have it use them
as it chooses.

svn path=/trunk/; revision=43049
2012-06-03 23:41:39 +00:00
Guy Harris 0b835b8cb6 As we might use cf->lnk_t while a capture is in progress, we need up
update it after each burst of packets.  (This is broken - we should have
cf->lnk_t be WTAP_ENCAP_PER_PACKET in all capture file formats that can
handle more than one packet type, and, in order to support writing out
*some* such files in formats that can only handle one packet type, just
use the type of the first packet when doing a one-pass operation and
gather up all the packet types in a multi-pass operation.)

svn path=/trunk/; revision=43048
2012-06-03 23:38:11 +00:00
Guy Harris dbfb305368 g_filename_display_basename() returns a g_mallocated string, so its
callers either need to free it or their callers need to free it or....

This means that cf_get_display_name() must always return a g_mallocated
string and its callers or... must free it.

For some of those callers, create a new set_window_title() routine to do
the work - they're all using the same pattern.

svn path=/trunk/; revision=43047
2012-06-03 22:03:05 +00:00
Anders Broman d1c1455882 Fix warnings
svn path=/trunk/; revision=43046
2012-06-03 20:59:41 +00:00
Guy Harris bfb179ba46 When allowing the user to save a capture file before closing it, if it's
a live capture:

	have the dialog note that what's being saved are captured
	packets;

	have the dialog note that the capture will be stopped if you
	close/quit;

	actually stop the capture before saving the file or closing it.

This should fix bug 7318 (it appears to do so in my tests).

svn path=/trunk/; revision=43045
2012-06-03 20:39:45 +00:00
Guy Harris 49ac36fd59 Use g_filename_display_basename() rather than get_basename() when we're
getting the basename for display purposes, so it's converted from the
GLib/GTK+ locale filename encoding to UTF-8.  (For Windows, the locale
filename encoding is UTF-8, and the internal encoding is UTF-16, so the
file names should *probably* all be valid UTF-8 - Windows may not
support invalid UTF-16 in file names.  For Qt, I'm not sure whether the
file dialogs ever return file names in some non-UTF-8 encoding.)

svn path=/trunk/; revision=43044
2012-06-03 19:31:59 +00:00
Guy Harris 6230f46670 Update a comment.
svn path=/trunk/; revision=43043
2012-06-03 18:48:51 +00:00
Guy Harris 5537e925f1 Move the declaration of main_set_window_name() frm ui/ui_util.h to
ui/gtk/main_titlebar.h.

svn path=/trunk/; revision=43042
2012-06-03 18:40:23 +00:00
Guy Harris 742b22dd43 Move routines that handle the main window title bar out of
ui/gtk/gui_utils.c into ui/gtk/main_titlebar.c, and the declaration of
one of them out of ui/ui_util.h into ui/gtk/main_titlebar.h, and rename
them to clarify that they work on the window name and titlebar.

svn path=/trunk/; revision=43041
2012-06-03 18:35:34 +00:00
Anders Broman 3ae9cc81c4 Add more depricated functions
svn path=/trunk/; revision=43040
2012-06-03 18:03:51 +00:00
Anders Broman 55ad6f8b53 Get rid of mor hbox:es
svn path=/trunk/; revision=43039
2012-06-03 18:03:00 +00:00
Anders Broman de19187a4f From Evan Huus: Reset the comment tree when the filter changes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7317
svn path=/trunk/; revision=43038
2012-06-03 17:52:05 +00:00
Guy Harris 19dfeda6d6 Note in a comment that we should perhaps handle safe-saving on top of a
symlink.

svn path=/trunk/; revision=43037
2012-06-03 17:35:34 +00:00
Guy Harris cd90f2b6f5 gedit, at least, says
The file "xxx" is read-only.

if you try to save over a file that has no read permission bits.

svn path=/trunk/; revision=43036
2012-06-03 17:25:08 +00:00
Pascal Quantin 6a4606b1f1 From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7324 :
Add support for the Gluster Handshake and Callback RPC-protocols

svn path=/trunk/; revision=43035
2012-06-03 17:15:21 +00:00
Guy Harris 1c03669611 Update a link (that's where it redirected to).
Remove "/en-us" from links; presumably it'll go to the appropriate
country and language for you (or will default to the country and primary
language of Redmond, Washington :-)).

svn path=/trunk/; revision=43034
2012-06-03 17:08:38 +00:00
Pascal Quantin 3201d56f05 Convert space to tab
svn path=/trunk/; revision=43033
2012-06-03 16:49:58 +00:00
Alexis La Goutte 6c8174a1a8 Make checkhf tools Happy, Remove hf_ieee80211_chan*
svn path=/trunk/; revision=43032
2012-06-03 16:49:01 +00:00