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
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
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
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
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
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
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
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
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
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
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