osmocom/wireshark
14
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
36846 commits 26 branches 0 tags 795 MiB
Commit graph

36846 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anders Broman
6d409485ac Remove register_stat_menu_item() if MAIN_MENU_USE_UIMANAGER 1 
svn path=/trunk/; revision=38658
 2011-08-22 07:46:10 +00:00
Anders Broman
2450d57b38 make MAIN_MENU_USE_UIMANAGER the default. 
svn path=/trunk/; revision=38657
 2011-08-22 07:44:56 +00:00
Anders Broman
338bd24858 Remove remaining gtk_item_factory (#ifdef HAVE_GTKOSXAPPLICATION) some one with OSX needs to test it. 
I'm not sure if it will work.

svn path=/trunk/; revision=38656
 2011-08-22 05:22:00 +00:00
Anders Broman
494cb3cd70 Add missing menus. 
svn path=/trunk/; revision=38655
 2011-08-22 05:14:08 +00:00
Gerald Combs
5aeec1def6 The canonical IANA port number URL now returns XML. Update 
make-services.pl to to use the old-style text URL and add a comment
about parsing the XML instead.

Update the services file. Due to format changes it generates a lot of
text that should be commented out, but it's apparently been doing that
for a while now.

svn path=/trunk/; revision=38652
 2011-08-21 22:34:50 +00:00
Anders Broman
c5433bb140 Fix a bunch of copy paste errors: 
ui_manager_tree_view_menu -> ui_manager_main_menubar

svn path=/trunk/; revision=38651
 2011-08-21 21:29:52 +00:00
Anders Broman
af6d7d7963 Make MAIN_MENU_USE_UIMANAGER the default. 
svn path=/trunk/; revision=38650
 2011-08-21 20:39:58 +00:00
Anders Broman
37454a3b0e Add the remaining menus when MAIN_MENU_USE_UIMANAGER. 
svn path=/trunk/; revision=38649
 2011-08-21 20:28:49 +00:00
Stig Bjørlykke
67149a7874 Add some NSTime methods: add, sub and unm. 
svn path=/trunk/; revision=38648
 2011-08-21 18:06:53 +00:00
Stig Bjørlykke
17f5a61ae0 Removed nstime_diff() in favour of nstime_delta(). 
Use nstime_delta() in nstime_subtract().

svn path=/trunk/; revision=38647
 2011-08-21 18:06:42 +00:00
Stig Bjørlykke
af91342478 Use nstime_delta() to calculate time difference. 
svn path=/trunk/; revision=38646
 2011-08-21 18:06:19 +00:00
Jörg Mayer
4a2f14ed6e Fix the remaining places that GDK_DISABLE_DEPRECATED complained about 
(mostly just comment in already present code).

svn path=/trunk/; revision=38645
 2011-08-21 16:07:41 +00:00
Anders Broman
65759680c9 Make register_gtk_stats_tree_tap() work with MAIN_MENU_USE_UIMANAGER 
svn path=/trunk/; revision=38643
 2011-08-21 16:03:13 +00:00
Jörg Mayer
214d6f44e6 Build gtkvumeter only on win32 
svn path=/trunk/; revision=38642
 2011-08-21 15:12:50 +00:00
Gerald Combs
3115572d34 [Automatic manuf, services and enterprise-numbers update for 2011-08-21] 
svn path=/trunk/; revision=38640
 2011-08-21 14:03:33 +00:00
Jörg Mayer
5d5c6a2fb0 Somehow I forgot to commit the patch to disable GDK_DISABLE_DEPRECATED 
for these files.

svn path=/trunk/; revision=38639
 2011-08-21 13:03:44 +00:00
Jörg Mayer
b2db1801ff Compile with GDK_DISABLE_DEPRECATED (the files that fail with this 
option disable it locally).

svn path=/trunk/; revision=38638
 2011-08-21 13:01:41 +00:00
Jörg Mayer
3d8fb4eb45 Get the replacement for the arc drawing working. 
Fix the crash by removing the call to gdk_cairo_set_source_color
  which for some reason caused the crash.
Remove the 3.0 hack and use the new code instead.
Always unset GDK_DEPRECATED compile flag as there are remaining 
  errors.

svn path=/trunk/; revision=38637
 2011-08-21 12:54:54 +00:00
Michael Tüxen
6088c432db Fix a typo. 
svn path=/trunk/; revision=38636
 2011-08-21 12:52:58 +00:00
Jörg Mayer
8dd10ec137 Missed one instance of arc -> ellipse renaming. 
svn path=/trunk/; revision=38635
 2011-08-21 11:20:31 +00:00
Jörg Mayer
8055401f67 The arc function was only used to draw filled ellipses. Change code to 
reflect this.

svn path=/trunk/; revision=38634
 2011-08-21 11:11:11 +00:00
Jörg Mayer
22f81827ca Small whitespace changes. 
svn path=/trunk/; revision=38633
 2011-08-21 09:11:04 +00:00
Stig Bjørlykke
530a18cbed Add missing newline at the end of the file. 
svn path=/trunk/; revision=38632
 2011-08-21 08:03:22 +00:00
Guy Harris
367054468c Put a newline at the end of the file. 
svn path=/trunk/; revision=38631
 2011-08-21 07:07:56 +00:00
Stig Bjørlykke
c06c20009d Fixed build withouth HAVE_PCAP_REMOTE. 
svn path=/trunk/; revision=38630
 2011-08-20 19:42:15 +00:00
Guy Harris
67c5a87057 The remote_options structure is not used if we don't have remote capture 
support in pcap, so don't declare it if HAVE_PCAP_REMOTE isn't defined.

svn path=/trunk/; revision=38629
 2011-08-20 19:30:35 +00:00
Jörg Mayer
00058274ed Fix unused parameter warning (turned error) in the ui-manager case. 
svn path=/trunk/; revision=38628
 2011-08-20 13:40:25 +00:00
Anders Broman
f02ea4f34c Add more register_dfilter_stat driven menus to MAIN_MENU_USE_UIMANAGER 
svn path=/trunk/; revision=38627
 2011-08-20 11:04:38 +00:00
Anders Broman
e9acf735c2 Make register_dfilter_stat work for MAIN_MENU_USE_UIMANAGER 
and add a bunch of menus.

svn path=/trunk/; revision=38626
 2011-08-20 09:55:32 +00:00
Jörg Mayer
41f61d4daa Add main_menubar.c 
svn path=/trunk/; revision=38625
 2011-08-19 16:53:07 +00:00
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