Commit Graph

36772 Commits

Author SHA1 Message Date
Jörg Mayer f2dcae17ae menus.[hc]:
set_menu_object_data_old has identical parameters to set_menu_object_data,
  and one was used only in the MAIN_MENU_USE_UIMANAGER case, the other in the
  non MAIN_MENU_USE_UIMANAGER case. Differentiate inside the function code and
  not via the function name.
main_filter_toolbar.c: Unify the set_menu_object_data and
  set_menu_object_data_old as the only difference was the function name.

svn path=/trunk/; revision=38580
2011-08-17 14:35:32 +00:00
Jörg Mayer b204b45400 Move #defines for MENU_BAR_PATH_* and PACKET_LIST_POPUP_PATH_* out of
menus.h to main_filter_toolbar.c, that's the only place where they are
used.
The #defines for PACKET_LIST_POPUP_PATH_* seem to be unused, so #if 0 them.


svn path=/trunk/; revision=38579
2011-08-17 14:19:25 +00:00
Anders Broman 2e95a6086d Fix a typo and size_request.
svn path=/trunk/; revision=38578
2011-08-17 14:05:54 +00:00
Anders Broman 9b1fbde0f2 Fix a typo and size_request.
svn path=/trunk/; revision=38577
2011-08-17 13:55:58 +00:00
Anders Broman 0280a6b1ce Get further with compiling with GTK 3.0
(No functional testing done yet)

svn path=/trunk/; revision=38576
2011-08-17 13:49:47 +00:00
Anders Broman b70c6ab594 Try to make tge build bot happy.
svn path=/trunk/; revision=38575
2011-08-17 11:41:23 +00:00
Anders Broman 1ad61cb1d5 Get rid of get_color() it looks like we do not need allocated collors.
The code is #if 0:ed out in case there is any ill side effects.

svn path=/trunk/; revision=38574
2011-08-17 10:53:46 +00:00
Anders Broman 706ea4dbd2 Fix indentation.
svn path=/trunk/; revision=38573
2011-08-17 07:10:33 +00:00
Stig Bjørlykke 6c6c045e3a Initialize trunc.
Fix CID 1229.

svn path=/trunk/; revision=38572
2011-08-16 19:25:29 +00:00
Chris Maynard 02ae47f0e8 From Jakub Ruzicka via bug 6240: Show data for trunked packets. Some typo fixes by me.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6240

svn path=/trunk/; revision=38571
2011-08-16 19:20:25 +00:00
Stig Bjørlykke 7a9f8874d9 Small fix in a error message.
svn path=/trunk/; revision=38570
2011-08-16 18:51:11 +00:00
Stig Bjørlykke c285091b7a Removed usage of localtime_r().
svn path=/trunk/; revision=38569
2011-08-16 17:51:38 +00:00
Stig Bjørlykke 38b2b88fc1 Remove unused code.
svn path=/trunk/; revision=38568
2011-08-16 17:37:04 +00:00
Guy Harris c19d21e6ac Casts to squelch warnings.
svn path=/trunk/; revision=38567
2011-08-16 17:23:39 +00:00
Stig Bjørlykke 7eabf9ef2d From Edwin Groothuis:
1. Add tooltip helps for the input and buttons.
2. Change the buttons from Apply OK Cancel to Apply Close.
3. Fixed the strange extrapolate behaviour by splitting the double float
   maths from the integer maths.
4. Also update the other three time fields: Seconds since first packet,
   seconds since previous captured packet, seconds since previous
   displayed packet.

From me:
Changed location for sanity checks.

svn path=/trunk/; revision=38566
2011-08-16 16:54:41 +00:00
Guy Harris 464778ed69 More misspellings of "unknown", for bug 6244.
svn path=/trunk/; revision=38565
2011-08-16 16:26:50 +00:00
Chris Maynard 5959387e7d Use col_append_sep_str() to comma-separate info column text. Fixes bug 6186.
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6186

svn path=/trunk/; revision=38564
2011-08-16 14:54:59 +00:00
Stig Bjørlykke 6a15feffa2 Check for valid filename in write_pdml_preamble().
Part of fix for bug 6245.

svn path=/trunk/; revision=38563
2011-08-16 13:42:08 +00:00
Stig Bjørlykke c66df8b030 From Yann via bug 6245:
Fixed crash in write_preamble().

svn path=/trunk/; revision=38562
2011-08-16 13:27:41 +00:00
Jeff Morriss 339136d1d0 Based on patch from Denis Ovsienko via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6244 :

Fix typo: s/unkown/unknown/

svn path=/trunk/; revision=38561
2011-08-16 13:16:33 +00:00
Graeme Lunt a8d3a3ea8c Allow the dissection of BER/DER carried over a TCP transport using
"Decode As..."


svn path=/trunk/; revision=38560
2011-08-16 12:28:17 +00:00
Guy Harris d7fe82f5cf At least for the Provider Service Table items, they're part of 802.11,
so precede their field names with "wlan.".  Fix some of their long names
and descriptions (no need to spell out "Internet Protocol" or "Medium
Access Control", for example).

Give the "Number of Channels" field a more reasonable name (and one that
avoids the problem of spelling "unknown" incorrectly).

svn path=/trunk/; revision=38559
2011-08-16 11:11:17 +00:00
Graeme Lunt b5cddc0336 An option to autoscroll the expanded item in the details view to a fixed
position (percentage) within the details view. 


svn path=/trunk/; revision=38558
2011-08-16 10:57:52 +00:00
Jörg Mayer bd12e1db1f For GTK3: Change type of unused parameter GtkObject -> GObject
svn path=/trunk/; revision=38557
2011-08-16 10:35:42 +00:00
Jörg Mayer c40f4e86db With gtk3, gtk_adjustment_new changed the return type:
GtkObject -> GtkAdjustment

svn path=/trunk/; revision=38556
2011-08-16 10:31:38 +00:00
Michael Tüxen 283877c9a7 Using enabled/disabled instead of yes/no seems to be more descriptive.
svn path=/trunk/; revision=38555
2011-08-16 10:03:49 +00:00
Michael Tüxen 31fae9a126 Handle the case in the capture options dialog box
where no interfaces are available.

svn path=/trunk/; revision=38554
2011-08-16 09:35:14 +00:00
Stig Bjørlykke c25dd4b1ce Don't prefix description with imf.
svn path=/trunk/; revision=38553
2011-08-16 09:08:36 +00:00
Gerald Combs ef6ddbd3e8 Add libwireshark.lib, libwsutil.lib, and wiretap-1.7.0.lib to the PDB
archive. Add libwsutil.pdb and sort a few items while we're here.

svn path=/trunk/; revision=38551
2011-08-15 22:00:21 +00:00
Stephen Fisher 7b9cfda971 Mark parent parameter to about_wireshark() as unused because its use
was commented out in r38549.


svn path=/trunk/; revision=38550
2011-08-15 21:20:59 +00:00
Anders Broman 5ab5d4e3b3 gdk_pixbuf_render_pixmap_and_mask_for_colormap() used in xpm_to_widget_from_parent is gone in GTK 3.0.
Rather tan trying to replace it go for the simpler xpm_to_widget() The
result looks the same to me.

svn path=/trunk/; revision=38549
2011-08-15 20:56:00 +00:00
Michael Tüxen 0e4d01e183 Use better names.
Make sure that the dlt is always set.

svn path=/trunk/; revision=38548
2011-08-15 20:39:44 +00:00
Stephen Fisher 68101b5aec Fix trivial compilation error:
gui_utils.c:1880:39: error: no newline at end of file


svn path=/trunk/; revision=38547
2011-08-15 16:17:36 +00:00
Anders Broman 06457078ea gtk_quit_add_destroy() is deprecated in GTK 3.0.
(I hope tis is the right thing to do).

svn path=/trunk/; revision=38546
2011-08-15 14:42:01 +00:00
Anders Broman 6ffe01240d Hmm try this instead.
svn path=/trunk/; revision=38545
2011-08-15 14:36:58 +00:00
Anders Broman fe265129ea gtk_quit_add_destroy() is deprecated in GTK 3.0.
(I hope tis is the right thing to do).

svn path=/trunk/; revision=38544
2011-08-15 14:30:14 +00:00
Anders Broman 1aa1fa8132 Save graph GTK =< 2.22
svn path=/trunk/; revision=38543
2011-08-15 05:36:48 +00:00
Anders Broman b5740c2288 From Jeremy Quirke:
misdecoding 3G Neighbour Cell Information Element in SI2quater message due to a coding typo

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

svn path=/trunk/; revision=38542
2011-08-15 04:39:30 +00:00
Anders Broman 05178612de Make save IO graph work, I had to make a local copy of
GTK 3.0 function gdk_pixbuf_get_from_surface() put in gui_util.c

svn path=/trunk/; revision=38541
2011-08-14 21:40:25 +00:00
Stig Bjørlykke a17cde69ec Check arguments to prefs_find_preference().
Fix CID 1259.

svn path=/trunk/; revision=38540
2011-08-14 20:31:16 +00:00
Stig Bjørlykke 532247bc52 Added extra argument check in rebuild_protocol_prefs_menu().
Fix CID 1258.

svn path=/trunk/; revision=38539
2011-08-14 20:21:12 +00:00
Stig Bjørlykke bafc8177de Use correct arguments in simple_dialog().
svn path=/trunk/; revision=38538
2011-08-14 19:55:10 +00:00
Stig Bjørlykke 0e52eb19f2 Use simple_dialog() for error messages.
Fix CID 1266.

svn path=/trunk/; revision=38537
2011-08-14 19:35:18 +00:00
Stig Bjørlykke 504af32d76 Use floorl() instead of truncl() on all platforms.
svn path=/trunk/; revision=38536
2011-08-14 18:53:28 +00:00
Guy Harris 92c1858253 gtk_combo_box_set_active() takes a GtkComboBox *, not a GtkComboBoxText
*, as its argument.

svn path=/trunk/; revision=38535
2011-08-14 17:14:52 +00:00
Gerald Combs 48166c84f4 [Automatic manuf, services and enterprise-numbers update for 2011-08-14]
svn path=/trunk/; revision=38532
2011-08-14 14:03:42 +00:00
Michael Tüxen 2d7dfd2e2d Being loopback is an interface property, not an address property.
Display it as such.

svn path=/trunk/; revision=38531
2011-08-14 13:05:08 +00:00
Michael Tüxen da2edcfa14 Take the interface description into account when looking up the preferred
interface to capture from.

svn path=/trunk/; revision=38530
2011-08-14 12:37:35 +00:00
Michael Tüxen 4e9dfbd55f Preserve previous selected capture filters when opening the Edit Interface Settings
dialog box. This fixes a bug reported by Chris.

svn path=/trunk/; revision=38529
2011-08-14 11:58:05 +00:00
Michael Tüxen cf2ad05140 Get rid of unused code.
svn path=/trunk/; revision=38528
2011-08-14 10:35:05 +00:00