Commit Graph

60 Commits

Author SHA1 Message Date
Jörg Mayer 420acb2fba We now always build with MAIN_MENU_USE_UIMANAGER, so remove all code using
the old ways except the proto_help.c file, which is kept for now in case someone
is willing to reimplement the help menus using non-deprecated methods.

svn path=/trunk/; revision=39137
2011-09-25 21:19:45 +00:00
Bill Meier 781129806f Fix ex "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39081
2011-09-21 17:49:11 +00:00
Anders Broman a192182e1c Make colors work on GTK3 take 2
Revert tcp_graph commit by mistake, typo etc

svn path=/trunk/; revision=38689
2011-08-23 14:17:30 +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
Anders Broman 91861a302e - Use cairo_surface_t
- rename variables refering to the surface.

svn path=/trunk/; revision=38497
2011-08-12 13:30:10 +00:00
Anders Broman bfc2da178b - Use cairo_surface_t
- rename variables refering to the surface.

svn path=/trunk/; revision=38496
2011-08-12 13:04:47 +00:00
Anders Broman 4ee4c14d06 Remove duplicate line-of-code.
(Copy change to rtp_analysis)

svn path=/trunk/; revision=38442
2011-08-10 04:53:21 +00:00
Anders Broman 210c311209 Don't include color.h
svn path=/trunk/; revision=38402
2011-08-08 08:55:42 +00:00
Anders Broman 7dcd23257d Get rid of gdk_draw_layout().
svn path=/trunk/; revision=38325
2011-08-03 18:49:35 +00:00
Jörg Mayer 68845aa779 Replace access to ...->allocation by gtk_widget_get_allocation +
using the return val - part 1
Maybe the call needs to be done more often.

Replace GTK_WIDGET_STATE by gtk_widget_get_state

svn path=/trunk/; revision=38215
2011-07-26 19:01:01 +00:00
Anders Broman 16ded15311 Code cleanup.
svn path=/trunk/; revision=38207
2011-07-26 05:35:19 +00:00
Anders Broman 3ff3727654 Use cairo for drawing to avoid deprecated functions.
svn path=/trunk/; revision=38203
2011-07-25 20:00:04 +00:00
Anders Broman 5552e61f6c Replace deprecated functions.
svn path=/trunk/; revision=38187
2011-07-24 18:03:53 +00:00
Jörg Mayer bb7650f70d Fix almost all accesses to ->window
svn path=/trunk/; revision=38151
2011-07-21 20:12:08 +00:00
Jörg Mayer 369929c2f6 Create a file containing macros to provide the access-functions
when the gtk version is too old (for the 2,14,0 case).

Remove all old access methods that were guarded by 2,14,0 tests.

Feel free to do the same for newer guards :-)

svn path=/trunk/; revision=38147
2011-07-21 17:44:02 +00:00
Jörg Mayer 99e0c43d35 Replace references to style by gtk_widget_get_style (according to
http://developer.gnome.org/gtk/2.24/GtkWidget.html#gtk-widget-get-style
this doesn't require a minimum version)

svn path=/trunk/; revision=38139
2011-07-21 00:16:05 +00:00
Jörg Mayer 1bf94efa12 Get rid of direct access to struct GtkToggleButton
svn path=/trunk/; revision=38113
2011-07-19 16:02:16 +00:00
Jörg Mayer 9166443e3c Get rid of all GtkAdjustment element accesses. Fix a bug
introduced when fixing this stuff for rtp_player.c

svn path=/trunk/; revision=38111
2011-07-19 14:33:50 +00:00
Anders Broman 6814cd03ee Replace deprecated gdk_pixmap_unref() with g_object_unref().
Update checkAPIs.

svn path=/trunk/; revision=38013
2011-07-14 08:11:16 +00:00
Jörg Mayer 11f131b303 Fix some compiler errors with -DGTK_DISABLE_DEPRECATED
svn path=/trunk/; revision=38006
2011-07-14 00:04:37 +00:00
Gerald Combs 5ad2293f40 More GLIB_CHECK_VERSION and GTK_CHECK_VERSION cleanup.
svn path=/trunk/; revision=37971
2011-07-11 18:35:36 +00:00
Bill Meier 9e3d46e08b Remove 3 lines of code no longer needed after SVN #37869
svn path=/trunk/; revision=37870
2011-07-02 21:06:51 +00:00
Bill Meier a2e7e3e2e7 Fix incorrect usage of gtk_radio_button_new_with_label()/gtk_radio_button_get_group();
Use gtk_radio_button_new_with_label_from_widget().

Essentially: gtk_radio_button_get_group() must be called after each gtk_radio_button_new...()
before using the 'group' GSList pointer in another call to gtk_radio_button_new...().

In these cases the incorrect usage appears to only have resulted in allowing multiple
radio buttons to be activated simultaneously.

(In at least one case elsewhere, the incorrect usage resulted in a Wireshark crash).



svn path=/trunk/; revision=37869
2011-07-02 21:00:56 +00:00
Guy Harris 6584ad9781 Add some more error checking.
svn path=/trunk/; revision=37648
2011-06-10 17:16:09 +00:00
Anders Broman 2cc50fa41c Try to fix the Ubuntu buildbot.
svn path=/trunk/; revision=37617
2011-06-08 13:11:51 +00:00
Bill Meier 54105fbc42 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: do some whitespace cleanup.

svn path=/trunk/; revision=37602
2011-06-07 22:59:19 +00:00
Guy Harris 8f53a5655c Make some routines static that aren't used outside the source file in
which they're defined.

Include some header files that declare functions in the source files
that define the functions.

Declare packet_list_get_type() in gtk/packet_list_store.h, as it defines
a macro that uses that function.

svn path=/trunk/; revision=37223
2011-05-17 23:33:23 +00:00
Anders Broman 8aa3a7b0ac More GUIManager stuff.
svn path=/trunk/; revision=37035
2011-05-10 05:31:45 +00:00
Anders Broman 0f6d022e33 More GUIManager stuff.
Note Use GUI manager needs to be set in gui_stet_menu.h too,
to use it.

svn path=/trunk/; revision=36985
2011-05-04 19:02:42 +00:00
Anders Broman bd8c36d4a3 Coverity UNUSED_VALUE
CID 1142,1143,1147

svn path=/trunk/; revision=36683
2011-04-17 18:00:14 +00:00
Chris Maynard 1e2ae5a88a Quote all fields when exporting to CSV. Fixes bug 2811.
svn path=/trunk/; revision=34920
2010-11-17 03:29:12 +00:00
Jeff Morriss b4c2ed1b86 Remove some unnecessary includes: a lot of things don't need globals.h and register.h
svn path=/trunk/; revision=34017
2010-08-30 16:10:01 +00:00
Bill Meier d5471f6a3d Fix two bugs related to use of the graph Y-Axis Scale combo-box:
1. Incorrect specification of units: Should be ms & s not us and ms;
   Bug introduced in SVN #33834.
2. Selecting 50ms as the yscale actually used 50us as the scale;
   Bug introduced in SVN #30543.

svn path=/trunk/; revision=33854
2010-08-19 21:51:35 +00:00
Bill Meier b0fcd85278 Various minor cleanups....
svn path=/trunk/; revision=33835
2010-08-18 01:01:06 +00:00
Bill Meier d97116bd7a Minor cleanup of iax2 graph:
- Display current value in combo boxes (pixels_per_tick, etc) to always
  match actual values being used to create graph;
- yscale combo box entries: 
   show ms values as ms (not x000 usecs);
   show us values with unit "us" (not "ms");
- Determine max yscale label width properly as the largest of the
  top or middle label lengths;
- Cleanup some indentation.

svn path=/trunk/; revision=33834
2010-08-18 00:04:53 +00:00
Guy Harris 2a328da4ef Instead of using a Boolean for the search direction, use an enum, so
that you can tell from examination whether the search is forward or
backward.

Make the cf_find_packet routines take the direction as an explicit
argument, rather than, in the cases where you don't want to permanently
set the direction, saving the direction in the capture_file structure,
changing it, doing the search, and restoring the saved direction.  Give
more information in the Doxygen comments for those routines.

Add a cf_find_packet_dfilter_string() routine, which takes a filter
string rather than a compiled filter as an argument.  Replace
find_previous_next_frame_with_filter() with it.

Have cf_read_frame_r() and cf_read_frame() pop up the error dialog if
the read fails, rather than leaving that up to its caller.  That lets us
eliminate cf_read_error_message(), by swallowing its code into
cf_read_frame_r().  Add Doxygen comments for cf_read_frame_r() and
cf_read_frame().

Don't have find_packet() read the packet before calling the callback
routine; leave that up to the callback routine.

Add cf_find_packet_marked(), to find the next or previous marked packet,
and cf_find_packet_time_reference(), to find the next or previous time
reference packet.  Those routines do *not* need to read the packet data
to see if it matches; that lets them run much faster.

Clean up indentation.

svn path=/trunk/; revision=33791
2010-08-13 07:39:46 +00:00
Gerald Combs 96558700c1 UTF-8-ize a bunch more arrows. If IE6 on XP can render them then they
*must* be safe to use, right?

svn path=/trunk/; revision=33326
2010-06-25 22:09:34 +00:00
Anders Broman 65ee4e797a From Jakub Zawadzki:
New functions: cf_read_frame_r, cf_read_frame

It's much easier to write:
 cf_read_frame (cf, fdata, &err, &err_info)
Than:
 wtap_seek_read (cf->wth, fdata->file_off, &cf->pseudo_header, cf->pd,
fdata->cap_len, &err, &err_info)

svn path=/trunk/; revision=32980
2010-05-26 19:11:23 +00:00
Bill Meier 7397bb0a74 Fix various gcc -Wshadow warnings.
svn path=/trunk/; revision=31737
2010-01-29 23:17:32 +00:00
Anders Broman 9d45f50695 Option_menu -> combo_box
svn path=/trunk/; revision=30543
2009-10-12 15:27:37 +00:00
Anders Broman 4bd41da307 Remove code guarded by #ifdef USE_CONVERSATION_GRAPH
as this eems to newer have been fully implemented and the old clist is replaced now.

svn path=/trunk/; revision=30425
2009-10-09 09:56:16 +00:00
Bill Meier 1bc9f19f05 Add #include <stdio.h> in a few more places for Solaris.
svn path=/trunk/; revision=29577
2009-08-27 03:54:57 +00:00
Kovarththanan Rajaratnam 80a6d3fbcf Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic.
svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
Kovarththanan Rajaratnam 3512e485ca Add PNODE_FINFO. We've been using PITEM_FINFO on proto_node's. This works because proto_item is typedefed to proto_node. We shouldn't rely on this since this is an implementation detail.
svn path=/trunk/; revision=29354
2009-08-09 17:33:23 +00:00
Anders Broman 6c25896d84 From Kovarththanan Rajaratnam:
No letter-shortcuts in Telephony menu.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3678

svn path=/trunk/; revision=29028
2009-07-08 18:36:31 +00:00
Gerald Combs e0ebc32195 Updates to create_tempfile:
- Use g_get_tmp_dir, just like get_tempfile_path.
  - Don't make the caller worry about the path buffer length.

svn path=/trunk/; revision=28915
2009-07-01 23:36:51 +00:00
Guy Harris cf91fdf16b Have tap listeners specify whether the "packet" routine requires
a protocol tree;

	the column values.

This includes stats-tree listeners.

Have the routines to build the packet list, and to retap packets, honor
those requirements.  This means that cf_retap_packets() no longer needs
an argument to specify whether to construct the column values or not, so
get rid of that argument.

This also means that there's no need for a tap to have a fake filter
to ensure that the protocol tree will be built, so don't set up a fake
"frame" filter.

While we're at it, clean up some cases where "no filter" was represented
as a null string rather than a null pointer.

Have a routine to return an indication of the number of tap listeners
with filters; use that rather than the global num_tap_filters.

Clean up some indentation and some gboolean vs. gint items.

svn path=/trunk/; revision=28645
2009-06-05 22:42:47 +00:00
Bill Meier c90204d7e2 Fix minor memory leaks; Minor reformatting
svn path=/trunk/; revision=28552
2009-06-01 11:35:52 +00:00