Commit graph

1647 commits

Author SHA1 Message Date
Bill Meier
35d1b406d7 From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10408

Note: The following parts of the patch had been previously done:
 asn1/snmp/packet-snmp-template.c
 epan/dissectors/packet-snmp.c
 epan/dissectors/packet-x11.c

svn path=/trunk/; revision=48448
2013-03-21 02:58:59 +00:00
Bill Meier
8112ecc321 From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404

Note: The following parts of the patch had been previously done:
 asn1/snmp/packet-snmp-template.c
 epan/dissectors/packet-snmp.c
 epan/dissectors/packet-x11.c

Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
 didn't compile and needed a few additional patches.


svn path=/trunk/; revision=48447
2013-03-21 02:29:09 +00:00
Gerald Combs
da1bdffa1b Reverse some logic.
svn path=/trunk/; revision=48446
2013-03-20 22:58:51 +00:00
Gerald Combs
a8e0c85548 Add frame_new, which creates a frame that best conforms to the GNOME,
Windows, and OS X HIGs. Use it in the capture options dialog. The
capture options dialog is a bit taller now and could probably use a bit
more tweaking.

In the capture options, conversation, and endpoint dialogs use our
best-guess dialog spacing and pad out some areas.

svn path=/trunk/; revision=48445
2013-03-20 22:41:51 +00:00
Bill Meier
0df5a9390d From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397

svn path=/trunk/; revision=48438
2013-03-20 01:18:10 +00:00
Bill Meier
a43e5a7eb9 Fix another case of "Widgets are not properly expanded in gtk3"
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7377#c21


svn path=/trunk/; revision=48437
2013-03-20 00:47:49 +00:00
Anders Broman
089dfcd108 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48424
2013-03-19 19:02:25 +00:00
Anders Broman
a10b98284c From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48412
2013-03-19 04:54:30 +00:00
Anders Broman
434aae5245 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48396
2013-03-18 19:47:33 +00:00
Bill Meier
eca156d710 From Jaap Keuter: Fix "GTK3: Interface List dialog does not expand properly"
From me: Add an XXX comment about an un-related issue

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


svn path=/trunk/; revision=48342
2013-03-16 18:57:35 +00:00
Anders Broman
f5a5b3d0fe From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48333
2013-03-15 22:39:37 +00:00
Michael Mann
3a48e7e1e2 Bugfix Decryption Key Management dialog, bug 8446 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8446)
Needed to convert use of old IEEE802.11 preference strings to UAT.  Since UAT is self-contained within its own file, the entire preference file doesn't need to be rewritten/saved when UAT values are changed.

svn path=/trunk/; revision=48308
2013-03-15 01:31:53 +00:00
Jaap Keuter
004d22cf0a Remove the tool string if all you do is free it in the end.
svn path=/trunk/; revision=48304
2013-03-14 22:01:48 +00:00
Bill Meier
c63dfc2ab4 gtk_widget_set_vexpand() is only for GTK3.
svn path=/trunk/; revision=48281
2013-03-13 20:25:28 +00:00
Bill Meier
ea64ac1937 Certain prefs window contents should not be centered vertically in GTK3.
(Fix: prevent vertical expand/fill of grid widget in certain cases).

(This stuff in GTK3 about "parents inheriting expand/fill properties from children"
is driving me crazy).

svn path=/trunk/; revision=48280
2013-03-13 20:04:48 +00:00
Alexis La Goutte
35daeed3f1 Fix compilation under Linux ../../../ui/gtk/prefs_capture.c: In function ‘ifopts_write_new_pmode’: ../../../ui/gtk/prefs_capture.c:2055:18: error: variable ‘all_pmode’ set but not used [-Werror=unused-but-set-variable]
svn path=/trunk/; revision=48279
2013-03-13 15:56:35 +00:00
Irene Rüngeler
44e6a88b13 Add interface options preferences.
svn path=/trunk/; revision=48275
2013-03-13 12:38:08 +00:00
Anders Broman
2cc00294c7 Use explicit casts.
svn path=/trunk/; revision=48260
2013-03-12 06:41:00 +00:00
Bill Meier
f97e7fa8ee Update GTK3 port status.
svn path=/trunk/; revision=48245
2013-03-11 17:26:03 +00:00
Bill Meier
978d314630 GTK3 "expand" handling changes.
As suggested by Peter Hatini in the patch attached to Bug #8315.

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


svn path=/trunk/; revision=48244
2013-03-11 17:15:54 +00:00
Bill Meier
5662419a06 Remove leftover "//".
svn path=/trunk/; revision=48242
2013-03-11 16:28:11 +00:00
Bill Meier
ed9c682383 From the proposed patch by Peter Hatina in Bug #8315.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8315


svn path=/trunk/; revision=48241
2013-03-11 16:18:41 +00:00
Bill Meier
db5727f34c Set the "Capture Options" window as the parent ('transient_for') of the "Interface Management" window.
svn path=/trunk/; revision=48240
2013-03-11 15:46:04 +00:00
Anders Broman
ac2515ee6f Use explicit casts.
svn path=/trunk/; revision=48239
2013-03-11 06:47:34 +00:00
Bill Meier
60b9be7c7b "Capture ! Options ! Manage Interfaces": Cleanup handling of Window epansion.
Improves 'expand' handling for both Gtk2 & Gtk3;

Adapted (with additions by me) from a proposed patch by Peter Hatina (Bug #8315).

Also:

1. Don't use gtk_widget_set_size() in several cases when a single use of
   gtk_window_set_default_size() for the "Manage Interfaces" window is sufficient.

2. Add an XXX comment as to a specific call to 'gtk_window_destroy_with_parent'
   actually being a no-op on Windows.

svn path=/trunk/; revision=48237
2013-03-11 01:11:38 +00:00
Anders Broman
98387d0498 Use explicit casts.
svn path=/trunk/; revision=48232
2013-03-10 16:56:40 +00:00
Anders Broman
deefa09237 Use explicit casts.
svn path=/trunk/; revision=48217
2013-03-09 17:33:15 +00:00
Evan Huus
1fbece78ab Two instances of s/delete/delete_id/ to satisfy C++ that were missed in
r48212 and were causing build failures.

svn path=/trunk/; revision=48214
2013-03-09 12:21:00 +00:00
Anders Broman
97c4bc6292 Use explicit casts.
svn path=/trunk/; revision=48212
2013-03-09 10:09:58 +00:00
Alexis La Goutte
a4eb0a12ed From Jose Pico via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8377 NEW FEATURE IMPLEMENTED: SMB2 SUPPORT FOR EXPORT->OBJECTS->SMB
Added functionality:
- SMB2 support for Export->Objects->SMB
- support for SMB_COM_CREATE, SMB_COM_OPEN, SMB_COM_READ and SMB_COM_WRITE commands
- Ability to choose between File Id and full file name as identifier for file re-building. Implemented as an option under Edit->Preferences->Protocols->SMB and Edit->Preferences->Protocols->SMB2.

Other minor changes and fixes:
- Full filename in file
- Inclusion of IP of SMB server when treeid name (i.e. hostname) is not known
- UTF-8 filenames encoding before passing them to Export Object Window
- Re-written insert_chunk function of export_object_smb.c to make it easier to debug
- Fixed of an error in insert_chunk function of export_object_smb.c (the verification of next free_chunk was always skipped after deleting one free_chunk).
- Removed duplicated code by inserting the function feed_eo_smb in packet-smb.c and packet-smb2.c
- Changed the label of Export->Objects->SMB menu into Export->Objects->SMB/SMB2

svn path=/trunk/; revision=48210
2013-03-09 08:44:14 +00:00
Anders Broman
58fd156d97 Use explicit casts.
svn path=/trunk/; revision=48202
2013-03-08 22:10:06 +00:00
Irene Rüngeler
00d64fade2 Don't try to show an IP address if none is present.
svn path=/trunk/; revision=48189
2013-03-08 09:00:48 +00:00
Anders Broman
5147d6cffa Use explicit casts.
svn path=/trunk/; revision=48187
2013-03-08 07:09:39 +00:00
Anders Broman
48ac65e5d6 Use explicit casts.
svn path=/trunk/; revision=48186
2013-03-08 06:07:26 +00:00
Anders Broman
76fd64bd9f Use explicit casts.
svn path=/trunk/; revision=48183
2013-03-07 22:57:36 +00:00
Anders Broman
dc505fd90e Make the prefernce settings work.
svn path=/trunk/; revision=48182
2013-03-07 22:57:11 +00:00
Anders Broman
ed87ba43a6 Use explicit casts.
svn path=/trunk/; revision=48179
2013-03-07 19:52:33 +00:00
Bill Meier
e59c185dae Fix proto stats window size allocation so it works with GTK3.
(adapted from a suggested patch by Peter Hatina in Bug #8315)
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8315)

From me:
 Widen the default width to show all the columns when the window is opened.

svn path=/trunk/; revision=48177
2013-03-07 19:25:36 +00:00
Bill Meier
a196e90c3b Tweak the handling of resizing the window.
svn path=/trunk/; revision=48169
2013-03-07 15:27:24 +00:00
Irene Rüngeler
3a4d29498d Use if_string instead og if_string->name.
svn path=/trunk/; revision=48168
2013-03-07 14:11:45 +00:00
Irene Rüngeler
ad61d2ca01 Use ifdefs for buffer size.
svn path=/trunk/; revision=48167
2013-03-07 13:16:48 +00:00
Irene Rüngeler
b85a76c21e Use ifdefs for buffer size.
svn path=/trunk/; revision=48166
2013-03-07 13:15:55 +00:00
Michael Tüxen
8e27dbe5d1 More ifdefs. Maybe this makes the mac buildbots happy.
svn path=/trunk/; revision=48165
2013-03-07 12:55:22 +00:00
Michael Tüxen
15501fad2a Try to fix the buildbots.
The patch for capture_dlg.c is from Anders...

svn path=/trunk/; revision=48164
2013-03-07 12:06:55 +00:00
Irene Rüngeler
cb42bc9fec Add buffersize and snap length to the preferences.
svn path=/trunk/; revision=48163
2013-03-07 09:16:55 +00:00
Anders Broman
d4e23d8daa Use explicit casts.
svn path=/trunk/; revision=48162
2013-03-07 07:48:33 +00:00
Anders Broman
5d698bfd88 Use explicit casts.
svn path=/trunk/; revision=48161
2013-03-07 07:05:45 +00:00
Gerald Combs
dcb3a4a8a5 Add support for software updates. Remove qtshark.rc and use
image/wireshark.rc (which contains resources needed by WinSparkle)
instead.

svn path=/trunk/; revision=48147
2013-03-06 22:04:17 +00:00
Anders Broman
12d85ac2b3 Use explicit casts.
svn path=/trunk/; revision=48144
2013-03-06 20:33:32 +00:00
Anders Broman
b8f6ce287f Get rid of xor_gc altogether, I think it's a remnant from the "old" cross-hair code.
svn path=/trunk/; revision=48141
2013-03-06 18:23:22 +00:00
Anders Broman
917661c7cb Get rid of xor_gc altogether, I think it's a remnant from the "old" cross-hair code.
svn path=/trunk/; revision=48140
2013-03-06 18:17:42 +00:00
Anders Broman
7990a0e4d0 Use explicit casts.
svn path=/trunk/; revision=48137
2013-03-06 17:35:11 +00:00
Bill Meier
974c0e18b9 gtk_alignment_new() args are gfloat; use constants of form 0.0F.
(A floating point constant without a suffix (e.g., 0.0) is a 'double'.

svn path=/trunk/; revision=48129
2013-03-06 04:43:12 +00:00
Jeff Morriss
5d21ea33e4 Actually add IPv6 addresses to the display.
svn path=/trunk/; revision=48128
2013-03-06 02:18:23 +00:00
Bill Meier
427790ed8f From Peter Hatina: Fix for: Gtk3 widgets are not properly expanded.
(Part of suggested patch for WIreshark 1.8 applied to trunk instead)

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

From me: Add an XXX xomment about how, on Windows, closing the top_level
Wireshark window while the capture_interfaces dialog window is open
will leave the associated dumpcap process running.


svn path=/trunk/; revision=48122
2013-03-06 00:33:58 +00:00
Anders Broman
b204e38aef Use explicit casts.
svn path=/trunk/; revision=48108
2013-03-05 22:15:20 +00:00
Bill Meier
faa06129a9 Remove a comment left over from the "old days".
Also: Add an XXX comment re one effect of the
      fact that, on Windows, dlg_window_new() does *not*
      set the newly created dialog window as 'transient for'
      the Wireshark top_level window.

svn path=/trunk/; revision=48106
2013-03-05 22:12:09 +00:00
Gerald Combs
75847e552a "HKEY_CURRENT_USER\Software\The Wireshark developer community, http://www.wireshark.org/\Wireshark\WinSparkle" isn't the prettiest registry path.
svn path=/trunk/; revision=48089
2013-03-05 18:46:50 +00:00
Jeff Morriss
19214234ae Followup to r48081: use the DEFAULT_CAPTURE_BUFFER_SIZE macro from r47942.
svn path=/trunk/; revision=48085
2013-03-05 15:22:28 +00:00
Chris Maynard
2b93c3b31e Default capture buffer size is now 2MB. (See also r47920 and r47937)
svn path=/trunk/; revision=48081
2013-03-05 02:09:37 +00:00
Bill Meier
0463fc2622 Fix a minor typo in SVN #48065
svn path=/trunk/; revision=48067
2013-03-04 21:04:57 +00:00
Bill Meier
1fb0ac3983 Fir Gtk 3.8 & newer: gtk_scrolled_window_add_with_viewport() ==> gtk_container_add().
svn path=/trunk/; revision=48065
2013-03-04 19:20:39 +00:00
Alexis La Goutte
8b76610965 Display "Select Decryption Mode" in Decryption Key Management (Broken by revision 47005)
svn path=/trunk/; revision=48059
2013-03-04 17:15:58 +00:00
Alexis La Goutte
4ee92ef970 Fix indent (Tabs => Spaces)
svn path=/trunk/; revision=48058
2013-03-04 17:15:48 +00:00
Bill Meier
fcb58073ef Whitespace & indentation cleanup.
svn path=/trunk/; revision=48050
2013-03-04 16:36:40 +00:00
Chris Maynard
e9907716a2 With Jim Young's suggestion, revert r43785. Currently the file->open dialog contains a *Read* filter field, not a display filter, so after the packets matching the read filter are loaded, there is no actual display filter applied. This resolves https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8344
svn path=/trunk/; revision=48046
2013-03-04 06:49:01 +00:00
Bill Meier
c9dee3bdda For GTK 3.4 and newer: use GtkColorChooserWidget;
(Implemented using a bit of a hack).

svn path=/trunk/; revision=48044
2013-03-04 04:53:44 +00:00
Bill Meier
48527645c9 Minor tweaks to "ColorSelection" UI:
- For each choice (marked/ignored fg/bg) always show orig color as "prev color";
 - Improve spacing between widgets.

Also;
 - Add a few explanatory comments;
 - Add editor modelines;
 - Cleanup whitespace/long-lines/formatting.

svn path=/trunk/; revision=48012
2013-03-02 17:47:56 +00:00
Balint Reczey
1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Bill Meier
93be111c38 Fix [-W shadow] issue in SVN #47958 in a slightly different manner than the fix SVN #47960.
svn path=/trunk/; revision=47976
2013-03-01 16:31:42 +00:00
Evan Huus
e4c436d10a Add some 'const's to satisfy latest GCC.
svn path=/trunk/; revision=47961
2013-03-01 01:39:33 +00:00
Evan Huus
88ad3f8282 Rename a variable s/color_edit_dlg/color_edit_window/ to fix a -Wshadow error
svn path=/trunk/; revision=47960
2013-02-28 23:44:32 +00:00
Bill Meier
2115cd7696 color_edit_dlg update:
- Significantly simplify & rework code;
- Use GtkColorChooser instead of GtkColorSelection if GTK 3.4 or newer.
- Minor UI cleanup (default buttons & etc)
- Fix crash which occurred in the (existing) GTK3 related code.
- Fix some other relatively minor bugs (including some minor memory leaks);
- Remove some old, commented-out code;
- Use a more consistent naming scheme for certain variables.

svn path=/trunk/; revision=47958
2013-02-28 23:05:09 +00:00
Anders Broman
6bf8fcfad4 Avoid a packet rescan if we don't have an AirPcap adapter.
svn path=/trunk/; revision=47945
2013-02-28 17:55:07 +00:00
Jeff Morriss
d0992bf8cd Add a #define for the default capture buffer size and use it.
svn path=/trunk/; revision=47942
2013-02-28 15:27:56 +00:00
Jeff Morriss
4e2090bdc9 From Anders: more places to increase the default capture buffer size.
svn path=/trunk/; revision=47939
2013-02-28 14:36:41 +00:00
Bill Meier
96a24cc79f Fix spelling/typos found using a list of commonly misspelled words.
The misspellings were mostly in comments but some were
in text strings visible to the user.


svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00
Bill Meier
a6e56df8b6 it's ==> its & its ==> it's as needed.
svn path=/trunk/; revision=47898
2013-02-26 02:38:52 +00:00
Bill Meier
162817ad33 it's ==> its & its ==> it's as needed.
In a few cases:
 Fix spelling;
 Clean up whitespace and formatting style.

svn path=/trunk/; revision=47889
2013-02-25 23:35:13 +00:00
Bill Meier
674e37d0a8 From Peter Hatina: test GDK_WINDOW_STATE_MAXIMIZED as a bit flag
(One small part of a suggested patch in Bug #8315).

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

svn path=/trunk/; revision=47863
2013-02-24 19:35:32 +00:00
Michael Mann
e094c21301 Minor Bluetooth fixes
1. Allow to DecodeBy payload over AVCTP
2. Fix L2CAP CID payload recognize after disc
3. Removed unneeded _U_
4. Fall back to control channel in AVRCP
5. Fix time-tracking for passthrough and capability AVRCP commands

From Michal Labedzki, bug 8367 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8367)

svn path=/trunk/; revision=47810
2013-02-21 22:00:32 +00:00
Gerald Combs
b0d958c4ed Don't yell at the user quite so much. Remove exclamation points from
some error messages and rephrase some others.

svn path=/trunk/; revision=47787
2013-02-21 01:00:44 +00:00
Martin Kaiser
4099ef9457 make function names consistent
edit_capture_dlg_launch() -> edit_capture_comment_dlg_launch()

svn path=/trunk/; revision=47780
2013-02-20 22:18:56 +00:00
Martin Kaiser
18ec6f01a3 kill an "edit capture comment" popup if the underlying file is closed
(at the moment, the edit window remains open even if the file is closed or
changed, this allows effectively to overwrite a file's capture commment with
the capture comment of a previously used file)

svn path=/trunk/; revision=47779
2013-02-20 22:08:00 +00:00
Gerald Combs
6d358bcba6 Forcing everyone to use the development update channel probably isn't
the best idea.

svn path=/trunk/; revision=47774
2013-02-20 20:16:49 +00:00
Gerald Combs
1129239b15 Add software_update.c.
svn path=/trunk/; revision=47767
2013-02-20 06:51:16 +00:00
Gerald Combs
b5e9e86826 Only call create_app_running_mutex on Windows.
svn path=/trunk/; revision=47766
2013-02-20 05:04:57 +00:00
Gerald Combs
bd4cffae58 When any of our executables start on Windows create or open a "Wireshark
is running" mutex. Have the NSIS installer check for this mutex and ask
the user to close Wireshark if it's found. While not perfect this makes
the WinSparkle update process much less annoying.

svn path=/trunk/; revision=47758
2013-02-20 01:19:42 +00:00
Gerald Combs
81a5be5813 Enable automatic updates for Win64. Fix a copy/paste error.
svn path=/trunk/; revision=47749
2013-02-19 22:57:40 +00:00
Gerald Combs
e48236a436 Add automatic software update checks for Win32 using WinSparkle. Add
preferences (currently hidden) to disable updates, set the update
frequency, and set the update "channel" (stable vs development). Add a
"Help" menu item to manually check for updates.

svn path=/trunk/; revision=47748
2013-02-19 22:21:17 +00:00
Guy Harris
8d7ffcc99b Add a macro that, for a given count of keys, returns the total size of
an AirpcapKeysCollection structure with that number of keys, and use it
instead of doing the calculation manually.

svn path=/trunk/; revision=47699
2013-02-17 03:45:06 +00:00
Martin Mathieson
18cb86cc23 Show resegmented data as grey.
svn path=/trunk/; revision=47687
2013-02-16 00:00:06 +00:00
Michael Mann
f5d559e879 Fix Voice RTP player crash if player is closed while playing
Bug 8065 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8065)

svn path=/trunk/; revision=47674
2013-02-15 15:31:24 +00:00
Guy Harris
6532f50bd9 main_window_slots.cpp includes ui_main_window.h, so make sure we build
ui_main_window.h before doing anything with main_window_slots.cpp.

svn path=/trunk/; revision=47659
2013-02-14 19:56:21 +00:00
Martin Kaiser
dbe4e9c07b remove _U_ for parameter that is used
svn path=/trunk/; revision=47644
2013-02-12 19:00:39 +00:00
Guy Harris
569aebade2 strlen() returns a size_t, so assign its return value to a size_t.
gtk_selection_data_set() takes an int, rather than a size_t, as its last
argument, so cast away that bit of "ZOMG ARENT SIZE_T AND INT THE SAME
SIZE!!!!!!!111ONE!!!!!"

svn path=/trunk/; revision=47628
2013-02-11 06:57:58 +00:00
Gerald Combs
a22790ae51 Use the same destination directory everywhere. If we're building an NSIS
package, assume that we're doing a "release" build.

svn path=/trunk/; revision=47615
2013-02-10 19:45:43 +00:00
Guy Harris
a13d58a509 Put NODIST_ at the beginning of macro names, as was done for the plugins
directory.

svn path=/trunk/; revision=47599
2013-02-09 23:35:30 +00:00
Gerald Combs
0eb047bcef Fix EXTRA_BINFILES for CMake + OS X.
svn path=/trunk/; revision=47595
2013-02-09 19:56:03 +00:00
Gerald Combs
942650fe0e Try to figure out if we built the rest of the project using Autotools or
CMake automatically.

svn path=/trunk/; revision=47576
2013-02-09 00:25:24 +00:00
Gerald Combs
d21f62b73b Add a directory name preference type (PREF_DIRNAME) and registration
routine (prefs_register_directory_preference). Add PREF_FILENAME and
PREF_DIRNAME support to the Qt module preferences. Change a couple of
preferences to directory names.

Clean up some names and default settings.

svn path=/trunk/; revision=47573
2013-02-08 18:07:34 +00:00
Chris Maynard
73b49715c9 Fix Coverity CID 973548: Dereference null return value.
#BACKPORT(1.8, 1.6)


svn path=/trunk/; revision=47568
2013-02-08 16:23:02 +00:00
Guy Harris
922a57753b Constify the second argument to uat_load(), to squelch some warnings.
svn path=/trunk/; revision=47560
2013-02-08 09:06:08 +00:00
Gerald Combs
dcd8e9df5a Add module_preferences_scroll_area.*.
svn path=/trunk/; revision=47546
2013-02-08 01:30:31 +00:00
Gerald Combs
24d67b60ab Add a ModulePreferencesScrollArea widget which builds a scrollable frame
for a preferences module. Use it to fill in the remaining preferences.
Don't show the printing preferences since they're not used here.

Change the titles and tooltips for some of the name resolution
preferences.

Disable the capture preferences if we can't capture. This is different
from the GTK+ version which hides it completely.

Thus concludes the preferences dialog (for the time being).

svn path=/trunk/; revision=47545
2013-02-08 01:16:46 +00:00
Gerald Combs
4f59c586d2 Remove some unnecessary definitions.
svn path=/trunk/; revision=47526
2013-02-06 21:55:58 +00:00
Gerald Combs
248310e3a7 Add filter expressions frame entries.
svn path=/trunk/; revision=47523
2013-02-06 19:03:23 +00:00
Gerald Combs
1c0deb0fc8 Add Filter Expressions^WButton^WShortcut^WBookmark preferences.
Add comments noting that

- We might want to do something different when the bookmark button is
  pressed.
- The display filters (dfilters file) and gui.filter_expressions
  preferences should be merged.
- Many buttons on Qt4 + OS X + unifiedTitleAndToolBarOnMac makes the
  main window really wide.

Add a qstring_strdup convenience routine. Add "disabled" display filter
edit icons. Fix up whitespace and descriptions in a couple of places.

svn path=/trunk/; revision=47522
2013-02-06 18:22:54 +00:00
Gerald Combs
7f398a97af Prettify Qt build output.
svn path=/trunk/; revision=47484
2013-02-05 05:17:16 +00:00
Guy Harris
02da11d645 Sigh. At least on my Fedora 16 with KDE, the Qt 4 versions of uic and
moc are called uic-qt4 and moc-qt4.  Look for them by names, plural.

svn path=/trunk/; revision=47457
2013-02-03 21:39:11 +00:00
Jeff Morriss
446926fa34 Move the get-runtime-version stuff back outside of #ifdef WIN32.
svn path=/trunk/; revision=47454
2013-02-03 18:31:23 +00:00
Anders Broman
d7b98a02d1 call load_wpcap before collecting the run-time version information.
svn path=/trunk/; revision=47451
2013-02-03 15:11:53 +00:00
Guy Harris
bf12f288db Reflect recent.c moving from the top-level directory to the ui
directory.

svn path=/trunk/; revision=47441
2013-02-02 06:05:59 +00:00
Guy Harris
6ebabce7b5 Move the GUI-independent window geometry stuff to ui/recent.c, so we
only have one copy.

svn path=/trunk/; revision=47440
2013-02-02 05:34:31 +00:00
Guy Harris
ab3840049e Reflect the move of recent.c to the ui directory.
svn path=/trunk/; revision=47439
2013-02-02 05:25:39 +00:00
Guy Harris
4d85cfeea6 Move recent.c to the ui directory, as we did with its header file.
svn path=/trunk/; revision=47438
2013-02-02 04:49:58 +00:00
Guy Harris
e62aba38e6 In Qt 4, C strings are, by default, treated as 7-bit ASCII when
converted to QStrings, and, to get them to be treated as UTF-8, you need
to call the setCodecForCStrings method of the QTextCodec class to set
the codec to a UTF-8 codec.

In Qt 5, C strings are treated always as UTF-8 when converted to
QStrings, and there's no setCodecForCStrings method for the QTextCodec
class.

In addition, there's also no setCodecForTr method for the QTextCodec
class - and QObject isn't documented as even *having* a tr method, so I
don't know what to do there.

svn path=/trunk/; revision=47436
2013-02-02 03:59:57 +00:00
Alexis La Goutte
8afb6106f2 Fix [ 68%] Building CXX object ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o ui/qt/font_color_preferences_frame.cpp: In member function ‘void FontColorPreferencesFrame::updateWidgets()’: ui/qt/font_color_preferences_frame.cpp:84:54: error: ‘class QFont’ has no member named ‘styleName’ make[2]: *** [ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o] Erreur 1 make[1]: *** [ui/qt/CMakeFiles/qtui.dir/all] Error 2
StyleName is not available in Qt < 4.8
disable this line for the moment (maye be add if QTVERSION > 4.8 ?)

svn path=/trunk/; revision=47409
2013-02-01 09:21:38 +00:00
Gerald Combs
52baba10a2 Update some tooltips.
svn path=/trunk/; revision=47404
2013-02-01 00:21:35 +00:00
Gerald Combs
89c5066f67 Add interface prefs. Adjust some spacing and resize behavior.
svn path=/trunk/; revision=47403
2013-02-01 00:14:15 +00:00
Martin Kaiser
b451f267b6 for an interface that does not support monitor mode, make sure that
monitor mode is not enabled

(this fixes the gui part but there's probably more to do)

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

svn path=/trunk/; revision=47399
2013-01-31 22:30:56 +00:00
Gerald Combs
3604d301c2 Use the name "Wireshark" instead of "qtshark" on OS X.
svn path=/trunk/; revision=47393
2013-01-31 18:54:14 +00:00
Guy Harris
47b8a34ebb GPOINTER_TO_INT() is the inverse of GINT_TO_POINTER().
svn path=/trunk/; revision=47374
2013-01-30 21:31:45 +00:00
Guy Harris
d29e1b5604 Use optargp, not optarg, in followSsl(), as in other routines; this
squelches a shadowing warning.

svn path=/trunk/; revision=47373
2013-01-30 21:07:19 +00:00
Michael Mann
7f3064e6ae Add support in TShark to follow SSL streams
From QA Cafe, bug 8280 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8280)

svn path=/trunk/; revision=47372
2013-01-30 20:36:47 +00:00
Gerald Combs
2afe999c21 Copy over r47277 from ui/gtk.
svn path=/trunk/; revision=47364
2013-01-30 00:07:57 +00:00
Anders Broman
80d3245f4a Try to detect duplicated packets due to mirroring/span ports by comparing src MAC addresses.
svn path=/trunk/; revision=47324
2013-01-28 15:41:45 +00:00
Anders Broman
317ccb2ff9 Whitespace and doxygen comment changes.
svn path=/trunk/; revision=47322
2013-01-28 12:04:15 +00:00
Chris Maynard
703263901b When searching for hex bytes from the "Find Packet" dialog, highlight the correct number of bytes. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8085
#BACKPORT
1.8: ui/gtk/main_proto_draw.c:packet_hex_print()
1.6: gtk/main_proto_draw.c:packet_hex_print()

svn path=/trunk/; revision=47277
2013-01-25 19:01:57 +00:00
Gerald Combs
4b99b36fed Add back the X11 substitutes.
svn path=/trunk/; revision=47264
2013-01-24 23:50:01 +00:00
Gerald Combs
d6de798226 Clean up font initialization a bit.
svn path=/trunk/; revision=47263
2013-01-24 23:42:34 +00:00
Bill Meier
92bc64a2ac Use ws_gtk_grid...() in place of gtk_table...().
This completes the process of replacing
     Wireshark gtk_table...() usage !!

(However: the prefs dialogs still have a few Gtk3
          related Expand/Fill issues which need to be fixed).

svn path=/trunk/; revision=47262
2013-01-24 21:21:51 +00:00
Chris Maynard
fae8a2aeb5 Separate Time Shift item from Time Reference items. From Cal Turney via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8176 with qt change from me.

svn path=/trunk/; revision=47261
2013-01-24 20:06:20 +00:00
Bill Meier
4670080829 Use ws_gtk_grid...() in place of gtk_table...();
Also: minor cleanup:
- use gtk_window_set_default_size() iso gtk_window_resize();
- change grid row numbers to start at 0 (not 1);
- fix some formatting/whitespace.

svn path=/trunk/; revision=47260
2013-01-24 18:28:31 +00:00
Gerald Combs
2dff8d7605 Add font and color preferences. Unfortunately Qt doesn't have a color
picker widget so we're back to popping up dialogs. Move the contents of
monospace_font.{cpp,h} to wireshark_application.{cpp,h}.

Pango and Qt use completely different string representations for fonts.
Add a separate gui.qt.font_name preference so that they don't clobber
each other.

svn path=/trunk/; revision=47240
2013-01-24 01:10:12 +00:00
Gerald Combs
469232d062 Update our column information even if we don't have a capture file loaded.
svn path=/trunk/; revision=47232
2013-01-23 19:28:08 +00:00
Gerald Combs
21e66f0c6f Add column preferences.
svn path=/trunk/; revision=47231
2013-01-23 19:04:36 +00:00
Gerald Combs
6ef1fc5002 GTK+:
Get rid of user-hostile behavior. In the layout preferences pane 2 & 3
radio buttons overrode the user's selection if a duplicate item was
selected. Now we assume that the user knows what he or she is doing and
steal duplicate selections from the other panes.

Qt:

Match the new GTK+ behavior in the layout preferences. Add padding
around the layout images. Add toolbar style preferences to the
Appearance pane (instead of the layout pane).

All:

Remove the selection mode and scrollbar placement prefs and mark them
obsolete as recently discussed on -dev.

Adjust the layout images yet again after more Awful Monitor Testing.

svn path=/trunk/; revision=47214
2013-01-22 18:27:18 +00:00
Chris Maynard
394b6c1c00 Fix VS Studio Analysis warning C6244: Local declaration of 'iftype' hides previous declaration at line '1046'
svn path=/trunk/; revision=47213
2013-01-22 17:31:07 +00:00
Chris Maynard
d85feecdd8 For menu consistency and shortcut simplification, change some "Ignore" related shortcuts to match "Mark" and "Time Reference" shortcuts. Specifically:
Ignore All Displayed Packets <alt><shift><control>D ==> <shift><control>D
Unignore All Packets         <shift><control>D      ==> <alt><control>D

svn path=/trunk/; revision=47203
2013-01-22 02:03:41 +00:00
Gerald Combs
8189823b73 Update the ignore shortcuts to match r47194.
svn path=/trunk/; revision=47200
2013-01-21 17:12:07 +00:00
Alexis La Goutte
cbdd3ca090 And (Q_)init resources (otherwise the images don't display when build with CMake)
svn path=/trunk/; revision=47199
2013-01-21 16:59:00 +00:00
Alexis La Goutte
980edc7034 Add UI_FILES list (more easy to use when add a new ui files...)
svn path=/trunk/; revision=47198
2013-01-21 16:58:51 +00:00
Alexis La Goutte
1e06850bb3 Add layout.qrc to QRC_FILES (otherwise it is not include to compressed source files)
svn path=/trunk/; revision=47197
2013-01-21 16:58:42 +00:00
Alexis La Goutte
6343c57d21 Add layout.qrc to CMake Build
svn path=/trunk/; revision=47196
2013-01-21 16:58:33 +00:00
Alexis La Goutte
ca854d396e Modify name of Preferences window
svn path=/trunk/; revision=47195
2013-01-21 16:58:22 +00:00
Chris Maynard
aed63758a1 Avoid using *<control>X shortcuts. In this case, using *<control>D instead.
From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8176

svn path=/trunk/; revision=47194
2013-01-21 16:36:40 +00:00
Gerald Combs
5143a55a7a Add layout_preferences_frame.ui.
svn path=/trunk/; revision=47191
2013-01-21 06:51:07 +00:00
Gerald Combs
5fcf513161 Add an initial layout preference pane. Set SVN properties.
svn path=/trunk/; revision=47190
2013-01-21 05:29:14 +00:00
Gerald Combs
3f3040b345 Increase the background opacity.
svn path=/trunk/; revision=47189
2013-01-21 02:47:32 +00:00