obnox/wireshark/wip.git
8 years agoUpdate the information about getting Xcode, and note that
guy [Wed, 24 Aug 2011 22:08:50 +0000 (22:08 +0000)]
Update the information about getting Xcode, and note that
PKG_CONFIG_PATH must include /usr/X11/lib/pkgconfig (the man page for
pkg-config 0.26 seems to indicate that pkg-config searches the
directories in PKG_CONFIG_PATH *in addition to* the standard
directories, so it *might* be sufficient to set PKG_CONFIG_PATH to
/usr/X11/lib/pkgconfig).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38725 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Olivier Montanuy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5458
alagoutte [Wed, 24 Aug 2011 21:58:14 +0000 (21:58 +0000)]
From Olivier Montanuy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5458
BGP add-path (Additional Paths) support for IPv4 unicast

From me:
Fix some whitespace/tab...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38724 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom astramax57 via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6188
alagoutte [Wed, 24 Aug 2011 21:37:37 +0000 (21:37 +0000)]
From astramax57 via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6188
In some BGP captures the AS_PATH attribute was decode wrong, if the asn length determines automatically

From me:
Fix some whitespace...
Fix error: ‘for’ loop initial declarations are only allowed in C99 mode
Replace unsigned by guint

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38723 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMark another widget argument as unused.
guy [Wed, 24 Aug 2011 20:58:10 +0000 (20:58 +0000)]
Mark another widget argument as unused.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38722 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCorrected position of filter autocompletion window when using GTK3.
stig [Wed, 24 Aug 2011 20:53:25 +0000 (20:53 +0000)]
Corrected position of filter autocompletion window when using GTK3.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38721 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPut back the experimental GTK3 code. To be tested tomorrow :-)
etxrab [Wed, 24 Aug 2011 19:45:33 +0000 (19:45 +0000)]
Put back the experimental GTK3 code. To be tested tomorrow :-)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38720 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoArgh, forgot the _U_:s
etxrab [Wed, 24 Aug 2011 19:34:27 +0000 (19:34 +0000)]
Argh, forgot the _U_:s

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38719 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse user data rather than setting object data.
etxrab [Wed, 24 Aug 2011 19:26:07 +0000 (19:26 +0000)]
Use user data rather than setting object data.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38718 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoBack out the previous commits, the graph blows up - at least in the GTK2 version.
etxrab [Wed, 24 Aug 2011 19:05:06 +0000 (19:05 +0000)]
Back out the previous commits, the graph blows up - at least in the GTK2 version.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38717 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMark widget parameter as unused a number of times
sfisher [Wed, 24 Aug 2011 18:57:10 +0000 (18:57 +0000)]
Mark widget parameter as unused a number of times

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38716 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGTK3 expose_event -> draw
etxrab [Wed, 24 Aug 2011 18:19:25 +0000 (18:19 +0000)]
GTK3 expose_event -> draw

Not compiled/tested

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38715 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMark length parameter as unused
sfisher [Wed, 24 Aug 2011 15:35:32 +0000 (15:35 +0000)]
Mark length parameter as unused

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38714 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse elm_len for the length.
etxrab [Wed, 24 Aug 2011 15:22:29 +0000 (15:22 +0000)]
Use elm_len for the length.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38713 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoXcode 4 isn't available on DVD, but is available for download from
guy [Wed, 24 Aug 2011 10:18:25 +0000 (10:18 +0000)]
Xcode 4 isn't available on DVD, but is available for download from
developer.apple.com, and the current version is available, at least for
Lion, from the Mac App Store.

While we're at it, make sure the X11 SDK is present, by checking for
/usr/X11/include.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38712 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCall gdk_cairo_create() for earlier versions of gtk.
martinm [Wed, 24 Aug 2011 09:41:17 +0000 (09:41 +0000)]
Call gdk_cairo_create() for earlier versions of gtk.
Is this correct?

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38711 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCode clean up as draw_arc works with cairo now.
etxrab [Wed, 24 Aug 2011 08:48:19 +0000 (08:48 +0000)]
Code clean up as draw_arc works with cairo now.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38710 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPaths changed for UI_MANAGER
etxrab [Wed, 24 Aug 2011 08:32:14 +0000 (08:32 +0000)]
Paths changed for UI_MANAGER

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38709 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSimplified some GTK_CHECK_VERSION to improve readability.
stig [Wed, 24 Aug 2011 08:28:39 +0000 (08:28 +0000)]
Simplified some GTK_CHECK_VERSION to improve readability.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38708 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGTK3 Remove gtk_window_set_has_resize_grip() as it creates
etxrab [Wed, 24 Aug 2011 08:12:08 +0000 (08:12 +0000)]
GTK3 Remove gtk_window_set_has_resize_grip() as it creates
warning "invalid cast from GtkStatusbar to GtkWindow".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38707 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGTK3 Remove gtk_window_set_has_resize_grip() as it creates
etxrab [Wed, 24 Aug 2011 08:02:37 +0000 (08:02 +0000)]
GTK3 Remove gtk_window_set_has_resize_grip() as it creates
warning "invalid cast from GtkStatusbar to GtkWindow".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38706 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSeveral Time Shift menu improvements:
stig [Wed, 24 Aug 2011 07:26:20 +0000 (07:26 +0000)]
Several Time Shift menu improvements:
- Added shortcut Shift-Control-T
- Set inactive when no loaded packets
- Add stock time icon
- Moved below time reference functions

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38705 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGTK3 expose_event -> draw
etxrab [Wed, 24 Aug 2011 07:26:11 +0000 (07:26 +0000)]
GTK3 expose_event -> draw

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38704 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoYet another cast.
stig [Wed, 24 Aug 2011 06:57:14 +0000 (06:57 +0000)]
Yet another cast.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38703 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a warning by changing a pointer type.
stig [Wed, 24 Aug 2011 06:42:40 +0000 (06:42 +0000)]
Fix a warning by changing a pointer type.

text2pcap.c: In function ‘parse_token’:
text2pcap.c:1076: warning: cast from pointer to integer of different size
text2pcap.c:1076: warning: cast from pointer to integer of different size

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38702 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGTK3 typo fixes:
jmayer [Wed, 24 Aug 2011 05:48:26 +0000 (05:48 +0000)]
GTK3 typo fixes:
Change iso->surface -> ios->surface
Rename draw_area_draw -> on_draw_area_draw_event
Change callback on_draw -> on_draw_area_draw_event
Remove trailing whitespace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38701 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGTK3:
jmayer [Wed, 24 Aug 2011 05:37:51 +0000 (05:37 +0000)]
GTK3:
Rename the function parameter from usr_data -> data.
Use allocation instead of allocationarea in one place.
Remove trailing whitespace.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38700 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a typo.
etxrab [Wed, 24 Aug 2011 05:25:04 +0000 (05:25 +0000)]
Fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38699 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGTK3 expose_event -> draw
etxrab [Wed, 24 Aug 2011 05:04:30 +0000 (05:04 +0000)]
GTK3 expose_event -> draw

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38698 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGTK3 expose_event -> draw
etxrab [Wed, 24 Aug 2011 04:53:50 +0000 (04:53 +0000)]
GTK3 expose_event -> draw

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38697 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix prematurely-terminated comment.
guy [Wed, 24 Aug 2011 02:37:36 +0000 (02:37 +0000)]
Fix prematurely-terminated comment.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38696 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a comment; this includes describing an additional way in which we
guy [Wed, 24 Aug 2011 02:25:08 +0000 (02:25 +0000)]
Fix a comment; this includes describing an additional way in which we
could fail to open the capture file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38695 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoHopefully fix
tuexen [Tue, 23 Aug 2011 23:10:50 +0000 (23:10 +0000)]
Hopefully fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6256.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38694 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Akos Lukovics:
stig [Tue, 23 Aug 2011 20:40:34 +0000 (20:40 +0000)]
From Akos Lukovics:
Bugfix moving averages.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38693 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake the byte highlighting work in GTK3
etxrab [Tue, 23 Aug 2011 16:39:40 +0000 (16:39 +0000)]
Make the byte highlighting work in GTK3

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38692 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoStatus update.
jmayer [Tue, 23 Aug 2011 14:53:18 +0000 (14:53 +0000)]
Status update.

The lua menu items do work in the ItemFactory code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38691 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMissed backing out one line...
etxrab [Tue, 23 Aug 2011 14:48:05 +0000 (14:48 +0000)]
Missed backing out one line...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38690 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake colors work on GTK3 take 2
etxrab [Tue, 23 Aug 2011 14:17:30 +0000 (14:17 +0000)]
Make colors work on GTK3 take 2
Revert tcp_graph commit by mistake, typo etc

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38689 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix build in the non gtk3 case: Add gpointer data to the
jmayer [Tue, 23 Aug 2011 14:13:34 +0000 (14:13 +0000)]
Fix build in the non gtk3 case: Add gpointer data to the
  parameter list.
Remove some trailing spaces.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38688 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake colors work on GTK3
etxrab [Tue, 23 Aug 2011 13:49:37 +0000 (13:49 +0000)]
Make colors work on GTK3

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38687 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Gisle Vanem:
stig [Tue, 23 Aug 2011 13:16:44 +0000 (13:16 +0000)]
From Gisle Vanem:
Rename header guard.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38686 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake the IO-grph work in GTK3.
etxrab [Tue, 23 Aug 2011 11:18:35 +0000 (11:18 +0000)]
Make the IO-grph work in GTK3.
The "expose-event" needs to be changed to "draw" in all files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38685 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGTK3 only builds if portaudio is disabled (rtp player is not
jmayer [Tue, 23 Aug 2011 09:31:25 +0000 (09:31 +0000)]
GTK3 only  builds if portaudio is disabled (rtp player is not
yet gtk3 ready).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38684 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove support for libpcre, we use GRegex in GLib.
stig [Tue, 23 Aug 2011 09:25:06 +0000 (09:25 +0000)]
Remove support for libpcre, we use GRegex in GLib.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38683 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix colors in GTK3
etxrab [Tue, 23 Aug 2011 07:36:41 +0000 (07:36 +0000)]
Fix colors in GTK3

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38682 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago"fix":
etxrab [Tue, 23 Aug 2011 05:06:54 +0000 (05:06 +0000)]
"fix":
Error: Found non-ASCII characters on line 4135 of packet-bacapp.c
Error: Found non-ASCII characters on line 4163 of packet-bacapp.c
Error: Found non-ASCII characters on line 4198 of packet-bacapp.c

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38681 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Andrei Emeltchenko via Chris Maynard:
etxrab [Tue, 23 Aug 2011 04:49:24 +0000 (04:49 +0000)]
From Andrei Emeltchenko via Chris Maynard:
btl2cap extended window shows wrong bit.
Patch would not apply cleanly so added by hand.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6257

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38680 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jack Yu modified by Chris Maynard:
etxrab [Tue, 23 Aug 2011 04:36:37 +0000 (04:36 +0000)]
From Jack Yu modified by Chris Maynard:
Enhancement of text2cap for parsing flexibility.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1723

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38679 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Steve Karg:
etxrab [Tue, 23 Aug 2011 04:26:01 +0000 (04:26 +0000)]
From Steve Karg:
BACnet Dissector latest enumerations for properties, states, error codes, and vendor ids.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6249

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38678 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Gisle Vanem via http://www.wireshark.org/lists/wireshark-dev/201108/msg00377...
cmaynard [Tue, 23 Aug 2011 01:54:13 +0000 (01:54 +0000)]
From Gisle Vanem via wireshark.org/lists/wireshark-dev/201108/msg00377.html: In follow_stream_cb(), if ct is NULL, bail out.  It was noted in a follow-up post by Guy that the "Follow stream" button should be grayed out if there are no conversations.  Until that is fixed, let's at least not crash.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38677 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemoved the call to g_warning() in proto_reg_handoff_opensafety(), as I didn't care...
cmaynard [Tue, 23 Aug 2011 01:08:32 +0000 (01:08 +0000)]
Removed the call to g_warning() in proto_reg_handoff_opensafety(), as I didn't care to see the "openSAFETY - Profinet IO heuristic dissector cannot be registered, openSAFETY/PNIO native dissection." message when I ran, "tshark -v".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38676 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGet the build working with GTK3 for real.
jmayer [Mon, 22 Aug 2011 16:35:53 +0000 (16:35 +0000)]
Get the build working with GTK3 for real.
Remove the check whether to disable the GTK_DEPRECATED stuff from menus.c,
  as it is only used for the deprecated code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38675 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMissed (at least) one place where to rename UI_MANAGER -> ENABLE_UI_MANAGER
jmayer [Mon, 22 Aug 2011 16:16:16 +0000 (16:16 +0000)]
Missed (at least) one place where to rename UI_MANAGER -> ENABLE_UI_MANAGER

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38674 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Akos Lukovics:
etxrab [Mon, 22 Aug 2011 14:22:50 +0000 (14:22 +0000)]
From Akos Lukovics:
Calculate moving averages in IO Graphs.

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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38673 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agogtk_action_get_label() is available in gtk+ 2.16 and higher...
tuexen [Mon, 22 Aug 2011 14:15:57 +0000 (14:15 +0000)]
gtk_action_get_label() is available in gtk+ 2.16 and higher...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38672 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agogtk_action_get_label() is GTK 2.16
etxrab [Mon, 22 Aug 2011 13:30:45 +0000 (13:30 +0000)]
gtk_action_get_label() is GTK 2.16

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38671 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoTypo
etxrab [Mon, 22 Aug 2011 13:01:53 +0000 (13:01 +0000)]
Typo

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38670 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd conversation filter menu
etxrab [Mon, 22 Aug 2011 12:34:41 +0000 (12:34 +0000)]
Add conversation filter menu

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38669 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago#if 0 in a consistent way. This should unbreak the Mac OS builders.
tuexen [Mon, 22 Aug 2011 11:27:39 +0000 (11:27 +0000)]
#if 0 in a consistent way. This should unbreak the Mac OS builders.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38668 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agomerge_all_tap_menus() has been moved to menus.c.
tuexen [Mon, 22 Aug 2011 11:25:59 +0000 (11:25 +0000)]
merge_all_tap_menus() has been moved to menus.c.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38667 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoour_menu_callback() is only used when MAIN_MENU_USE_UIMANAGER
tuexen [Mon, 22 Aug 2011 11:25:00 +0000 (11:25 +0000)]
our_menu_callback() is only used when MAIN_MENU_USE_UIMANAGER
is not defined.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38666 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMore code cleanup.
etxrab [Mon, 22 Aug 2011 10:36:04 +0000 (10:36 +0000)]
More code cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38665 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agofunnel_stat.c:606: warning: unused parameter 'group'
etxrab [Mon, 22 Aug 2011 10:22:18 +0000 (10:22 +0000)]
funnel_stat.c:606: warning: unused parameter 'group'

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38664 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a typo
jmayer [Mon, 22 Aug 2011 08:42:52 +0000 (08:42 +0000)]
Fix a typo

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38663 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't export register_stat_menu_item_stock().(UI_MANAGER).
etxrab [Mon, 22 Aug 2011 08:37:32 +0000 (08:37 +0000)]
Don't export register_stat_menu_item_stock().(UI_MANAGER).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38662 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agowalk_menu_tree_for_selected_packet() and walk_menu_tree_for_selected_tree_row does...
etxrab [Mon, 22 Aug 2011 08:16:14 +0000 (08:16 +0000)]
walk_menu_tree_for_selected_packet() and walk_menu_tree_for_selected_tree_row does not work as we no longer get the path. Leave those menus enabled by default.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38661 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agodcerpc_stat.c:525: warning: unused parameter 'action'
etxrab [Mon, 22 Aug 2011 08:09:09 +0000 (08:09 +0000)]
dcerpc_stat.c:525: warning: unused parameter 'action'

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38660 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRename UI_MANAGER to ENABLE_UI_MANAGER, put it into
jmayer [Mon, 22 Aug 2011 08:08:38 +0000 (08:08 +0000)]
Rename UI_MANAGER to ENABLE_UI_MANAGER, put it into
  CMakeOptions and enable it by default.
Update comment in proto_help that this feature is no
  longer built by default.
Enable PYTHON by default.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38659 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove register_stat_menu_item() if MAIN_MENU_USE_UIMANAGER 1
etxrab [Mon, 22 Aug 2011 07:46:10 +0000 (07:46 +0000)]
Remove register_stat_menu_item() if MAIN_MENU_USE_UIMANAGER 1

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38658 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agomake MAIN_MENU_USE_UIMANAGER the default.
etxrab [Mon, 22 Aug 2011 07:44:56 +0000 (07:44 +0000)]
make MAIN_MENU_USE_UIMANAGER the default.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38657 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove remaining gtk_item_factory (#ifdef HAVE_GTKOSXAPPLICATION) some one with OSX...
etxrab [Mon, 22 Aug 2011 05:22:00 +0000 (05:22 +0000)]
Remove remaining gtk_item_factory (#ifdef HAVE_GTKOSXAPPLICATION) some one with OSX needs to test it.
I'm not sure if it will work.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38656 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd missing menus.
etxrab [Mon, 22 Aug 2011 05:14:08 +0000 (05:14 +0000)]
Add missing menus.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38655 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoThe canonical IANA port number URL now returns XML. Update
gerald [Sun, 21 Aug 2011 22:34:50 +0000 (22:34 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38652 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a bunch of copy paste errors:
etxrab [Sun, 21 Aug 2011 21:29:52 +0000 (21:29 +0000)]
Fix a bunch of copy paste errors:
ui_manager_tree_view_menu -> ui_manager_main_menubar

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38651 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake MAIN_MENU_USE_UIMANAGER the default.
etxrab [Sun, 21 Aug 2011 20:39:58 +0000 (20:39 +0000)]
Make MAIN_MENU_USE_UIMANAGER the default.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38650 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd the remaining menus when MAIN_MENU_USE_UIMANAGER.
etxrab [Sun, 21 Aug 2011 20:28:49 +0000 (20:28 +0000)]
Add the remaining menus when MAIN_MENU_USE_UIMANAGER.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38649 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd some NSTime methods: add, sub and unm.
stig [Sun, 21 Aug 2011 18:06:53 +0000 (18:06 +0000)]
Add some NSTime methods: add, sub and unm.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38648 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemoved nstime_diff() in favour of nstime_delta().
stig [Sun, 21 Aug 2011 18:06:42 +0000 (18:06 +0000)]
Removed nstime_diff() in favour of nstime_delta().
Use nstime_delta() in nstime_subtract().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38647 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse nstime_delta() to calculate time difference.
stig [Sun, 21 Aug 2011 18:06:19 +0000 (18:06 +0000)]
Use nstime_delta() to calculate time difference.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38646 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix the remaining places that GDK_DISABLE_DEPRECATED complained about
jmayer [Sun, 21 Aug 2011 16:07:41 +0000 (16:07 +0000)]
Fix the remaining places that GDK_DISABLE_DEPRECATED complained about
(mostly just comment in already present code).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38645 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake register_gtk_stats_tree_tap() work with MAIN_MENU_USE_UIMANAGER
etxrab [Sun, 21 Aug 2011 16:03:13 +0000 (16:03 +0000)]
Make register_gtk_stats_tree_tap() work with MAIN_MENU_USE_UIMANAGER

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38643 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoBuild gtkvumeter only on win32
jmayer [Sun, 21 Aug 2011 15:12:50 +0000 (15:12 +0000)]
Build gtkvumeter only on win32

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38642 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-08-21]
gerald [Sun, 21 Aug 2011 14:03:33 +0000 (14:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-08-21]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38640 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSomehow I forgot to commit the patch to disable GDK_DISABLE_DEPRECATED
jmayer [Sun, 21 Aug 2011 13:03:44 +0000 (13:03 +0000)]
Somehow I forgot to commit the patch to disable GDK_DISABLE_DEPRECATED
for these files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38639 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCompile with GDK_DISABLE_DEPRECATED (the files that fail with this
jmayer [Sun, 21 Aug 2011 13:01:41 +0000 (13:01 +0000)]
Compile with GDK_DISABLE_DEPRECATED (the files that fail with this
option disable it locally).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38638 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoGet the replacement for the arc drawing working.
jmayer [Sun, 21 Aug 2011 12:54:54 +0000 (12:54 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38637 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a typo.
tuexen [Sun, 21 Aug 2011 12:52:58 +0000 (12:52 +0000)]
Fix a typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38636 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMissed one instance of arc -> ellipse renaming.
jmayer [Sun, 21 Aug 2011 11:20:31 +0000 (11:20 +0000)]
Missed one instance of arc -> ellipse renaming.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38635 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoThe arc function was only used to draw filled ellipses. Change code to
jmayer [Sun, 21 Aug 2011 11:11:11 +0000 (11:11 +0000)]
The arc function was only used to draw filled ellipses. Change code to
reflect this.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38634 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSmall whitespace changes.
jmayer [Sun, 21 Aug 2011 09:11:04 +0000 (09:11 +0000)]
Small whitespace changes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38633 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd missing newline at the end of the file.
stig [Sun, 21 Aug 2011 08:03:22 +0000 (08:03 +0000)]
Add missing newline at the end of the file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38632 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPut a newline at the end of the file.
guy [Sun, 21 Aug 2011 07:07:56 +0000 (07:07 +0000)]
Put a newline at the end of the file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38631 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFixed build withouth HAVE_PCAP_REMOTE.
stig [Sat, 20 Aug 2011 19:42:15 +0000 (19:42 +0000)]
Fixed build withouth HAVE_PCAP_REMOTE.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38630 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoThe remote_options structure is not used if we don't have remote capture
guy [Sat, 20 Aug 2011 19:30:35 +0000 (19:30 +0000)]
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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38629 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix unused parameter warning (turned error) in the ui-manager case.
jmayer [Sat, 20 Aug 2011 13:40:25 +0000 (13:40 +0000)]
Fix unused parameter warning (turned error) in the ui-manager case.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38628 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd more register_dfilter_stat driven menus to MAIN_MENU_USE_UIMANAGER
etxrab [Sat, 20 Aug 2011 11:04:38 +0000 (11:04 +0000)]
Add more register_dfilter_stat  driven menus to MAIN_MENU_USE_UIMANAGER

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38627 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake register_dfilter_stat work for MAIN_MENU_USE_UIMANAGER
etxrab [Sat, 20 Aug 2011 09:55:32 +0000 (09:55 +0000)]
Make register_dfilter_stat work for MAIN_MENU_USE_UIMANAGER
and add a bunch of menus.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38626 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd main_menubar.c
jmayer [Fri, 19 Aug 2011 16:53:07 +0000 (16:53 +0000)]
Add main_menubar.c

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38625 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoTry to fix the build bot.
etxrab [Fri, 19 Aug 2011 15:40:02 +0000 (15:40 +0000)]
Try to fix the build bot.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38624 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd a few more menu items.
etxrab [Fri, 19 Aug 2011 14:46:47 +0000 (14:46 +0000)]
Add a few more menu items.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38623 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd one more menu item.
etxrab [Fri, 19 Aug 2011 14:12:55 +0000 (14:12 +0000)]
Add one more menu item.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@38622 f5534014-38df-0310-8fa8-9805f1628bb7