Commit graph

707 commits

Author SHA1 Message Date
Martin Kaiser
eea9174bcf allow setting a capture comment from the statusbar when a capture was started
for the decision to allow input of a capture comment, we should make no
difference between the statusbar icon and Statistics / Summary menu item

svn path=/trunk/; revision=45108
2012-09-24 19:12:01 +00:00
Martin Kaiser
82654a12f0 fix compilation on linux
ui/gtk/capture_file_dlg.c needs ui/file_dialog.h

svn path=/trunk/; revision=45107
2012-09-24 18:59:44 +00:00
Gerald Combs
e9d4c115b5 Fix compilation on Windows.
svn path=/trunk/; revision=45106
2012-09-24 17:44:11 +00:00
Gerald Combs
25eab1c383 Unify some of the GTK+ and Win32 "Save As" code and behavior. This will
likely break compilation on Windows. I'll take care of it shortly.

svn path=/trunk/; revision=45105
2012-09-24 17:04:50 +00:00
Guy Harris
8c174d2ae7 Just as we don't show the "Wireless Settings" button for non-AirPcap
adapters, we don't show the "Remote Settings" button for local adapters.
(Back when the buttons were in the Capture Options dialog, always having
the button there and making it sensitive or insensitive based on the
interface you specified may have made sense; now that it's in a dialog
popped up when you double-click on a particular interface, so the dialog
always applies to a particular interface, it no longer makes sense.)

Get rid of the unused E_OPT_REMOTE_BT_KEY key.

svn path=/trunk/; revision=45085
2012-09-24 07:41:19 +00:00
Jakub Zawadzki
29235b9d10 Glib type checking might be cheap, but there's no need to do it twice.
(Actually many GtkTreeModel don't check types at all).

svn path=/trunk/; revision=45073
2012-09-23 18:20:42 +00:00
Jakub Zawadzki
72ca9d0e61 Store pointers to previously displayed and captured packet, not nstime_t deltas.
This commit reduces size (from 144B to 128B on AMD64) of frame_data structure.

Part of bug 5821: Reduce per-packet memory requirements.

svn path=/trunk/; revision=45071
2012-09-23 16:25:28 +00:00
Jakub Zawadzki
2fc1cdeb74 Speedup loading capture files by about 20%-30% (wireshark only)
Right now packetlist model is used only by one treeview,
so we can check if packetlist->view has connected model if no, 
don't emit row-inserted signal.

svn path=/trunk/; revision=45063
2012-09-23 10:57:05 +00:00
Jaap Keuter
37b6ca2ce8 Fix for bug 7744:
Have the DND data receiver make sure that the URI-list is always correctly terminated. Do so for any source, either X server, Windows or OS X.

svn path=/trunk/; revision=45058
2012-09-22 23:47:23 +00:00
Guy Harris
777c3930f6 Do not display a "Wireless Settings" button for non-AirPcap interfaces;
it can confuse users, so that they ask why this is grayed out on their
non-Windows machine and ask how to enable it.

Nobody uses the AIRPCAP_OPTIONS_ADVANCED_KEY datum attached to the box
in which the button appears, so get rid of it.

svn path=/trunk/; revision=45056
2012-09-22 20:09:55 +00:00
Chris Maynard
29ba21d1e7 Change "LED" to "icon" and add a packet comment icon to the corresponding expert info tab if the preference for displaying them is enabled. Basically, extend the fix for bug 3196 to include the packet comments tab. Also, fix some typos.
svn path=/trunk/; revision=45053
2012-09-22 17:02:34 +00:00
Jeff Morriss
be3c572d4f Fix a read-after-free (as detected by Valgrind):
Go to the next element in the recent cf list before freeing the current
element.

svn path=/trunk/; revision=45026
2012-09-20 16:37:29 +00:00
Anders Broman
79171ea7ef Have File->import write pcapng files.
svn path=/trunk/; revision=45025
2012-09-20 13:16:27 +00:00
Jeff Morriss
3729335973 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45016
2012-09-20 01:48:30 +00:00
Gerald Combs
3e05236eff Add gzip support to the Win32 "Save As" dialog. Don't crash in the Win32
merge dialog if we cancel. Adjust the size and location of the controls
in the Win32 open and merge file templates.

svn path=/trunk/; revision=45014
2012-09-19 23:06:39 +00:00
Jeff Morriss
ace4a357aa Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7731 :
Allow the configured number of dfilters to be added to the drop-down list
(instead of limiting the list--on a freshly installed system with no recent
dfilters--to just 2).  Regression caused by r42439.

svn path=/trunk/; revision=45012
2012-09-19 21:29:31 +00:00
Guy Harris
32603d204a Fix format string.
svn path=/trunk/; revision=44994
2012-09-18 23:52:45 +00:00
Guy Harris
f665fd4777 Fix call to g_filename_to_uri(), and do error checking.
svn path=/trunk/; revision=44992
2012-09-18 23:08:43 +00:00
Gerald Combs
c4d22dbe11 import_text_dialog.cpp: Use the common help URL routines.
main_window.cpp: QMessageBox::exec returns a StandardButton, not a ButtonRole.
help_dlg.c: Remove extra blank lines.

svn path=/trunk/; revision=44991
2012-09-18 22:52:34 +00:00
Gerald Combs
8967d312ad Move the UI-independent help URL code to ui/help_url.[ch].
svn path=/trunk/; revision=44987
2012-09-18 21:51:22 +00:00
Jeff Morriss
623720dc92 Add python cache and temporary files to the list of files to clean up.
svn path=/trunk/; revision=44974
2012-09-18 17:40:50 +00:00
Jeff Morriss
a97731bbcb If we have PYTHON use make-tap-reg.py (like we do on Windows): it's slightly
faster than the old shell-script version (~150 msec instead of ~500 msec on
my system).

svn path=/trunk/; revision=44971
2012-09-18 14:48:28 +00:00
Anders Broman
d41c249f91 callsinfo->stop_fd not set in all branches for UNISTIM.
svn path=/trunk/; revision=44940
2012-09-17 14:51:08 +00:00
Bill Meier
724df1c0d3 Minor cleanup:
- remove unneeded gtk_table_resize() [in prep for using gtk_grid for GTK3];
- use g_hash_table)_full() to specify function to free 'value'
- Fix some whitespace.

svn path=/trunk/; revision=44933
2012-09-17 00:42:22 +00:00
Bill Meier
3f04e5b7d0 Minor cleanup:
- simplify code related to use of GHashTables;
- use consistent whitespace and formatting style.

svn path=/trunk/; revision=44932
2012-09-17 00:03:19 +00:00
Bill Meier
fa2c82bb7b Cleanup:
- remove unneeded gtk_table_resize() [in prep for using GtkGrid for GTK3];
- simplify code relating to use of a GHashTable;
- add comment about use of !! magic !! numeric constants;
- do some additional whitespace cleanup.

svn path=/trunk/; revision=44931
2012-09-16 23:02:07 +00:00
Bill Meier
707e1767fd Trivial cleanup:
- Remove unneeded #includes;
- Use consistent whitespace and formatting style.

svn path=/trunk/; revision=44930
2012-09-16 19:06:42 +00:00
Bill Meier
f58dafe947 (trivial) fix a typo
svn path=/trunk/; revision=44929
2012-09-16 18:00:56 +00:00
Bill Meier
201c4c45bf Trivial whitespace formatting cleanup;
svn path=/trunk/; revision=44919
2012-09-15 14:46:13 +00:00
Bill Meier
4889fb0443 Minor cleanup:
- Remove unneeded #includes;
- Remove unused function [which uses deprecated gtk_table...()];
- Use consistent whitespace formatting style.

svn path=/trunk/; revision=44918
2012-09-15 14:20:20 +00:00
Bill Meier
b69bbdf6ac Trivial cleanup;
Remove a few unneeded initializers;
  Fix a few typos in comments;
  Use consistent formatting style.

svn path=/trunk/; revision=44917
2012-09-15 14:08:48 +00:00
Evan Huus
dd01cc0490 From Niels Widger via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7725
Add get_filter method to Wireshark's Lua interface (to correspond with the
already-exposed set_filter method).

svn path=/trunk/; revision=44916
2012-09-15 13:58:57 +00:00
Guy Harris
bd16652c90 text_import_scanner_lex.h and text_import_scanner.c are now part of
libui, not libgtkui.

svn path=/trunk/; revision=44913
2012-09-15 08:43:27 +00:00
Guy Harris
366489a085 DIRTY_GENERATED_C_FILES is empty, and isn't used by ui/gtk/Makefile.am,
so get rid of it, and stop using it in ui/gtk/Makefile.make; we don't
want to encourage people to create source files that get warnings.

svn path=/trunk/; revision=44910
2012-09-15 08:18:57 +00:00
Gerald Combs
f6c7b3e533 libgtkui_dirty → libui_dirty.
svn path=/trunk/; revision=44907
2012-09-14 21:06:26 +00:00
Gerald Combs
fe6816d7fd More fixes for the text import move.
svn path=/trunk/; revision=44906
2012-09-14 20:55:11 +00:00
Gerald Combs
9bcb9561fc Deletions from the last commit didn't make it for some reason.
svn path=/trunk/; revision=44905
2012-09-14 20:47:55 +00:00
Gerald Combs
762e5ac93f Create a common libui using CMake similar to what we do with Autotools.
Move the GTK+ text import code to the common UI directory. Create
wtap_encap_requires_phdr() from code in file_import_dlg.c.

svn path=/trunk/; revision=44904
2012-09-14 20:23:18 +00:00
Bill Meier
dd7a2708be Use consistent indentation and formatting style;
Fix a few typos; Fix long line.

svn path=/trunk/; revision=44902
2012-09-14 15:19:15 +00:00
Bill Meier
a2d442133f Use consistent indentation and formatting.
svn path=/trunk/; revision=44889
2012-09-14 03:24:23 +00:00
Jeff Morriss
c1312434b2 Also disable the resize grip on the profile bar (as it is on the info and
packets bars; this is for GTK < 3.0).

This fixes the problem I had that the profile bar normally took up way too
much (horizontal) room when I start Wireshark (causing the contents of the
much more interesting packets bar to be truncated).

svn path=/trunk/; revision=44885
2012-09-12 21:02:54 +00:00
Gerald Combs
38b0e99c4d Fix breakage from r44859.
svn path=/trunk/; revision=44862
2012-09-10 21:55:55 +00:00
Gerald Combs
f764eabb67 Combine some of the the Windows and non-Windows merge code and make it
behave the same on each platform. This might break the non-Windows builds.
I'll test & fix any problems shortly.

svn path=/trunk/; revision=44859
2012-09-10 21:27:49 +00:00
Martin Kaiser
17a8522cb6 update the expert info entries after a packet comment was modified
the packet comment window can be opened from the expert infos
by clicking on a comment, when a comment is modified in this way, we
have to cf_retap_packets() to update the expert infos window

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7690


svn path=/trunk/; revision=44852
2012-09-10 19:48:16 +00:00
Anders Broman
eaf81ff987 From Rick Krull:
One can't resize the columns on several "tree views".  The one that I ran into
was "Decode As: Show".  I added "set_resizable" to make it resizable.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7706

svn path=/trunk/; revision=44828
2012-09-10 08:36:03 +00:00
Gerald Combs
4333dd03f4 Don't use a variable after we've freed it.
svn path=/trunk/; revision=44796
2012-09-06 22:39:42 +00:00
Evan Huus
471b4d94ef Remove string constants from g_assert() calls, as per thread on wireshark-dev:
http://www.wireshark.org/lists/wireshark-dev/201209/msg00030.html

svn path=/trunk/; revision=44774
2012-09-05 01:44:09 +00:00
Jörg Mayer
12a0aa4849 - Replace packet_list_recreate_visible_rows -> packet_list_recreate_visible_rows_list
- Replace new_packet_list_ -> packet_list_


svn path=/trunk/; revision=44765
2012-09-04 02:35:25 +00:00
Jörg Mayer
380fe63a6d Rename new_packet_list.[ch] to packet_list.[ch]
svn path=/trunk/; revision=44764
2012-09-04 01:57:36 +00:00
Jeff Morriss
005bc98d09 LIBGCRYPT_CFLAGS and LIBGNUTLS_CFLAGS don't seem to be necessary here.
svn path=/trunk/; revision=44759
2012-09-03 19:56:25 +00:00