Commit Graph

36816 Commits

Author SHA1 Message Date
Anders Broman c66eaaf484 Try to fix the build bot.
svn path=/trunk/; revision=38624
2011-08-19 15:40:02 +00:00
Anders Broman 23fe110f2d Add a few more menu items.
svn path=/trunk/; revision=38623
2011-08-19 14:46:47 +00:00
Anders Broman b3c2b02840 Add one more menu item.
svn path=/trunk/; revision=38622
2011-08-19 14:12:55 +00:00
Anders Broman 670f6a2e0d Add UTC timeformats to the menu.
svn path=/trunk/; revision=38621
2011-08-19 13:53:20 +00:00
Anders Broman 47ef461007 Add a few more menu items.
svn path=/trunk/; revision=38620
2011-08-19 13:38:03 +00:00
Anders Broman 7e1f3aa473 Put the UIManager menubar code in a separate file.
svn path=/trunk/; revision=38619
2011-08-19 12:40:51 +00:00
Anders Broman 1c9c62e1ca Mark length as U(nsused)
svn path=/trunk/; revision=38618
2011-08-19 12:15:54 +00:00
Anders Broman e56f077015 Fix MM Context for E-UTRAN SRVCC elment lengths
svn path=/trunk/; revision=38617
2011-08-19 12:02:49 +00:00
Stig Bjørlykke 9c7e12c572 Introduce NSTime Lua object to handle nstime_t.
This object can be used to retreive other absolute and relative time fields,
create and modify nstime_t values and put generated time values in the tree.

Also added ProtoField.absolute_time and ProtoField.relative_time.

svn path=/trunk/; revision=38616
2011-08-19 08:36:02 +00:00
Anders Broman c65403769a GTK 3.0
Make tcp_graph.c build on GTK3 without breaking GTK2.
Cross and Window scaling graph is not working in GTK 3.

svn path=/trunk/; revision=38615
2011-08-19 08:13:48 +00:00
Anders Broman d4951b8e7e GTK 3.0 "Comment out" GTK 2 code for now. Functionality needs to be restored on GTK 3.
svn path=/trunk/; revision=38614
2011-08-19 04:36:40 +00:00
Stephen Fisher beebce0a29 Back out previous commit (38612) which was the brutal patch to build with
GTK 3 because not all of it is contained within #if statements for GTK 3
builds and could affect GTK 2 builds as well.


svn path=/trunk/; revision=38613
2011-08-19 00:01:11 +00:00
Stephen Fisher 3852c508f9 From Anders on -dev:
Brutal patch to build with GTK 3.0 

With the enclosed patch Wireshark builds on GTK3.0. Colors are messed up etc but
it should be possible to start to fix things and actually see what's happening.
I wouldn't be surprised if many patches leading up to this are faulty. Color
handling should probably be rewritten to use GdkRGBA in many places etc.

  http://www.wireshark.org/lists/wireshark-dev/201108/msg00383.html 


svn path=/trunk/; revision=38612
2011-08-18 23:55:01 +00:00
Stephen Fisher a6d3e1fa30 Change || in an "if test" statement to "-o"
svn path=/trunk/; revision=38611
2011-08-18 23:48:46 +00:00
Gerald Combs aad44caa94 Update the AirPcap code in prefs_dlg.c to match the changes made to
airpcap_dlg.c long ago in r28350. Re-enable GTK_DISABLE_DEPRECATED. Add
a comment to airpcap_loader.c about moving functionality to
packet-ieee80211.c.

svn path=/trunk/; revision=38610
2011-08-18 23:04:23 +00:00
Michael Tüxen 1f9f878af8 Get --enable-ui-manager working.
svn path=/trunk/; revision=38609
2011-08-18 22:50:35 +00:00
Gerald Combs d644c6fc57 Add "WPA" to the 802.11 decryption key preference text.
svn path=/trunk/; revision=38608
2011-08-18 21:46:28 +00:00
Jörg Mayer aa22951fa8 When building with GTK3 we *must* use the ui-manager interface,
the ItemFactory stuff doesn't exists any more.

svn path=/trunk/; revision=38607
2011-08-18 20:38:25 +00:00
Stephen Fisher dd7d285d0f Temporary fix to get Windows build going again: undefine GTK_DISABLE_DEPRECATED if building on Windows. See: http://www.wireshark.org/lists/wireshark-dev/201108/msg00373.html
svn path=/trunk/; revision=38606
2011-08-18 16:15:23 +00:00
Anders Broman 483a30c0ff GTK 3.0 Typo.
svn path=/trunk/; revision=38605
2011-08-18 15:28:25 +00:00
Anders Broman 34117d0d80 GTK 3.0 Fix colors(?)
svn path=/trunk/; revision=38604
2011-08-18 13:59:53 +00:00
Anders Broman 06d97d0a53 GTK 3.0 fix a couple of gtk_style_context_get().
svn path=/trunk/; revision=38603
2011-08-18 13:44:27 +00:00
Anders Broman 5e415e85e6 Draw the cursor line using ccairo
svn path=/trunk/; revision=38602
2011-08-18 13:43:59 +00:00
Alexis La Goutte cd3e81d97c From Ryan Hoffman via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6122
Malformed Packet in decode for BGP-AD (autodiscovery) update (RFC6074)

From me:
Add support of RFC6074 (BGP-AD) in BGP dissector.
Both BGP-AD and VPLS-BGP (RFC4761) use the same AFI/SAFI, The NLRI length must be used as a demultiplexer. (See RFC6074  Section 7 : BGP-AD and VPLS-BGP Interoperability)

svn path=/trunk/; revision=38601
2011-08-18 13:43:24 +00:00
Alexis La Goutte 21e7a7a277 Enhance support of RD Type 2 (FORMAT_AS4_LOC) (RFC4364)
svn path=/trunk/; revision=38600
2011-08-18 12:51:30 +00:00
Anders Broman b30ce63eef Use cairo_surface_t instead of axis_pixmap.
svn path=/trunk/; revision=38599
2011-08-18 12:20:11 +00:00
Anders Broman 2c2780994e Use cairo_surface_t instead of title_pixmap.
svn path=/trunk/; revision=38598
2011-08-18 11:02:38 +00:00
Jörg Mayer 1c28cec86e Fix a typo in the gtk3 case
svn path=/trunk/; revision=38597
2011-08-18 10:54:55 +00:00
Anders Broman 9704d11b0f GTK 3.0 version of modify forground.
svn path=/trunk/; revision=38596
2011-08-18 08:58:29 +00:00
Jörg Mayer 9fba87cbce Fix two typos in the gtk3 case
svn path=/trunk/; revision=38595
2011-08-18 08:49:05 +00:00
Anders Broman 814cce2a49 Copy-paste errors.
svn path=/trunk/; revision=38594
2011-08-18 06:43:35 +00:00
Anders Broman b73070850a More GTK 3.0 changes.
svn path=/trunk/; revision=38593
2011-08-18 06:37:28 +00:00
Stig Bjørlykke 7fb2c994df From Gisle Vanem:
Patch for a missing WINAPI.

svn path=/trunk/; revision=38592
2011-08-17 19:46:13 +00:00
Anders Broman 1c990cffb2 Use gtk_widget_override_font() in GTK 3.0 ( Untested on GTK 3.0)
svn path=/trunk/; revision=38591
2011-08-17 19:39:34 +00:00
Jörg Mayer b4b971a159 Replace deprecated functions/macros
svn path=/trunk/; revision=38590
2011-08-17 18:13:25 +00:00
Alexis La Goutte 2c649f7b78 From Sergey V. Lobanov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6128
Wireshark doesn't decode BGP.MP_REACH_NLRI.NLRI when RD type is 2(defined in
RFC4364:4.2)

From me:
 Add RD type 2 (FORMAT_AS4_LOC) (not tested... based only on RFC spec..)

svn path=/trunk/; revision=38589
2011-08-17 18:09:27 +00:00
Jörg Mayer b87f22700e Always build with -DGTK_DISABLE_DEPRECATED. The files that
fail when built in specific configurations will disable this
option when required.

svn path=/trunk/; revision=38588
2011-08-17 17:34:56 +00:00
Jörg Mayer fad50cbaf8 These two files cannot be compiled with GTK_DISABLE_DEPRECATED
as long as they are still using the non MAIN_MENU_USE_UIMANAGER
case.

svn path=/trunk/; revision=38587
2011-08-17 17:29:27 +00:00
Jörg Mayer 50b504cacf Use gpointer instead of GtkItemFactoryCallback for functions
register_stat_menu_item and register_stat_menu_item_stock in
the non MAIN_MENU_USE_UIMANAGER case. This is in preparation
for the next patch.

svn path=/trunk/; revision=38586
2011-08-17 17:27:50 +00:00
Jörg Mayer c08fbd2ab8 Unifiy parameters to menu_open_recent_file_cmd for the
MAIN_MENU_USE_UIMANAGER and on MAIN_MENU_USE_UIMANAGER case
(use gpointer instead of GtkWidget*/GetAction*).
In at least some cases the calling paramter is of
type gpointer anyway.

svn path=/trunk/; revision=38585
2011-08-17 17:24:49 +00:00
Gerald Combs 5520a452b5 The MSDN page for ZeroMemory recommends using SecureZeroMemory instead,
so do so. Add ZeroMemory to checkAPIs.pl.

svn path=/trunk/; revision=38584
2011-08-17 16:54:24 +00:00
Gerald Combs 78d49fadf5 From Gisle Vanem: Make sure our SetProcessDEPPolicyHandler typedef
matches the documentation.

I also verified that DEP is still enabled on Win32 using Process Explorer.

svn path=/trunk/; revision=38583
2011-08-17 16:47:04 +00:00
Stephen Fisher 0cd8dc13e0 Fix compilation on when not using MAIN_MENU_USE_UIMANAGER
svn path=/trunk/; revision=38582
2011-08-17 15:52:12 +00:00
Anders Broman 60a42bf902 More GTK 3.0 changes:
- In main skipp RC for now
- main_proto_draw incomplete fix.(#if 0)

svn path=/trunk/; revision=38581
2011-08-17 15:29:15 +00:00
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