osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
36786 commits 23 branches 0 tags 1.3 GiB
Commit graph

5672 commits

Author SHA1 Message Date
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
Jörg Mayer
c40f4e86db With gtk3, gtk_adjustment_new changed the return type: 
GtkObject -> GtkAdjustment

svn path=/trunk/; revision=38556
 2011-08-16 10:31:38 +00:00
Michael Tüxen
283877c9a7 Using enabled/disabled instead of yes/no seems to be more descriptive. 
svn path=/trunk/; revision=38555
 2011-08-16 10:03:49 +00:00
Michael Tüxen
31fae9a126 Handle the case in the capture options dialog box 
where no interfaces are available.

svn path=/trunk/; revision=38554
 2011-08-16 09:35:14 +00:00
Stephen Fisher
7b9cfda971 Mark parent parameter to about_wireshark() as unused because its use 
was commented out in r38549.


svn path=/trunk/; revision=38550
 2011-08-15 21:20:59 +00:00
Anders Broman
5ab5d4e3b3 gdk_pixbuf_render_pixmap_and_mask_for_colormap() used in xpm_to_widget_from_parent is gone in GTK 3.0. 
Rather tan trying to replace it go for the simpler xpm_to_widget() The
result looks the same to me.

svn path=/trunk/; revision=38549
 2011-08-15 20:56:00 +00:00
Michael Tüxen
0e4d01e183 Use better names. 
Make sure that the dlt is always set.

svn path=/trunk/; revision=38548
 2011-08-15 20:39:44 +00:00
Stephen Fisher
68101b5aec Fix trivial compilation error: 
gui_utils.c:1880:39: error: no newline at end of file


svn path=/trunk/; revision=38547
 2011-08-15 16:17:36 +00:00
Anders Broman
06457078ea gtk_quit_add_destroy() is deprecated in GTK 3.0. 
(I hope tis is the right thing to do).

svn path=/trunk/; revision=38546
 2011-08-15 14:42:01 +00:00
Anders Broman
6ffe01240d Hmm try this instead. 
svn path=/trunk/; revision=38545
 2011-08-15 14:36:58 +00:00
Anders Broman
fe265129ea gtk_quit_add_destroy() is deprecated in GTK 3.0. 
(I hope tis is the right thing to do).

svn path=/trunk/; revision=38544
 2011-08-15 14:30:14 +00:00
Anders Broman
1aa1fa8132 Save graph GTK =< 2.22 
svn path=/trunk/; revision=38543
 2011-08-15 05:36:48 +00:00
Anders Broman
05178612de Make save IO graph work, I had to make a local copy of 
GTK 3.0 function gdk_pixbuf_get_from_surface() put in gui_util.c

svn path=/trunk/; revision=38541
 2011-08-14 21:40:25 +00:00
Stig Bjørlykke
532247bc52 Added extra argument check in rebuild_protocol_prefs_menu(). 
Fix CID 1258.

svn path=/trunk/; revision=38539
 2011-08-14 20:21:12 +00:00
Stig Bjørlykke
bafc8177de Use correct arguments in simple_dialog(). 
svn path=/trunk/; revision=38538
 2011-08-14 19:55:10 +00:00
Stig Bjørlykke
0e52eb19f2 Use simple_dialog() for error messages. 
Fix CID 1266.

svn path=/trunk/; revision=38537
 2011-08-14 19:35:18 +00:00
Stig Bjørlykke
504af32d76 Use floorl() instead of truncl() on all platforms. 
svn path=/trunk/; revision=38536
 2011-08-14 18:53:28 +00:00
Guy Harris
92c1858253 gtk_combo_box_set_active() takes a GtkComboBox *, not a GtkComboBoxText 
*, as its argument.

svn path=/trunk/; revision=38535
 2011-08-14 17:14:52 +00:00
Michael Tüxen
2d7dfd2e2d Being loopback is an interface property, not an address property. 
Display it as such.

svn path=/trunk/; revision=38531
 2011-08-14 13:05:08 +00:00
Michael Tüxen
da2edcfa14 Take the interface description into account when looking up the preferred 
interface to capture from.

svn path=/trunk/; revision=38530
 2011-08-14 12:37:35 +00:00
Michael Tüxen
4e9dfbd55f Preserve previous selected capture filters when opening the Edit Interface Settings 
dialog box. This fixes a bug reported by Chris.

svn path=/trunk/; revision=38529
 2011-08-14 11:58:05 +00:00
Michael Tüxen
cf2ad05140 Get rid of unused code. 
svn path=/trunk/; revision=38528
 2011-08-14 10:35:05 +00:00
Michael Tüxen
663fb7525f Use address counter... 
svn path=/trunk/; revision=38527
 2011-08-14 10:22:31 +00:00
Michael Tüxen
473c12b676 Improve handling of remote interfaces. 
svn path=/trunk/; revision=38526
 2011-08-14 09:54:52 +00:00
Stig Bjørlykke
82dac06ce7 Count number of ip addresses and use this count to determine if we shall 
print the addresses string in the devices list.

svn path=/trunk/; revision=38525
 2011-08-14 09:29:47 +00:00
Michael Tüxen
6ec2a9b199 Improve the resizing of the capture options dialog box. 
This was suggested by Stig.

svn path=/trunk/; revision=38524
 2011-08-14 08:54:53 +00:00
Stig Bjørlykke
f9405bc5a5 Use correct callback for time shift. 
Don't use <control>A for time shift.

svn path=/trunk/; revision=38523
 2011-08-14 08:03:25 +00:00