Commit Graph

836 Commits

Author SHA1 Message Date
Stephen Fisher e7057d72d8 Remove random ; at the end of preprocessor directive.
svn path=/trunk/; revision=26572
2008-10-27 05:24:01 +00:00
Stephen Fisher b8b74f901d Add About, Preferences and a working Quit option to the OS X application menu
when ige mac integration is used.


svn path=/trunk/; revision=26569
2008-10-27 04:40:54 +00:00
Stephen Fisher 1fa606decf More updates to the IGE Mac OS X integration feature:
- Adds preference "MacOS X style" to the (G)UI preferences pane
 - When the preference above is enabled, the menu bar is moved from
   the Wireshark window to the top of the screen.  It is no longer displayed
   in both places at once.  This preference defaults to on.
 - Calls function to enable shortcut keys for OS X top of screen menus.
 - NOTE: The IGE Mac Integration functions change the Control key to Command
         key in the menus.  This may or may not be desirable.


svn path=/trunk/; revision=26565
2008-10-26 23:07:37 +00:00
Ronnie Sahlberg 24b76bdc14 add a -K command line option to provide the name of the kerberos keytab
file to use for decryption of Krb5 and GSS-KRB


svn path=/trunk/; revision=26343
2008-10-03 05:21:28 +00:00
Sake Blok 0996e23a81 Fix for Bug 2891:
Read the capture setting from the preferences *before* parsing the
capture command line arguments.


svn path=/trunk/; revision=26268
2008-09-25 06:21:02 +00:00
Bill Meier 99c797748e Fix minor typo/spelling ...
svn path=/trunk/; revision=26048
2008-08-20 19:27:07 +00:00
Stig Bjørlykke e0740e22e5 Remove the "Save column widths" option so we always save the widths.
svn path=/trunk/; revision=25968
2008-08-09 16:14:34 +00:00
Gerald Combs 98f5096bbd Replace r25638 with a better fix. On Windows, don't open a console window if
we've been passed "-i -", since it clobbers stdio.

svn path=/trunk/; revision=25695
2008-07-09 23:28:18 +00:00
Bill Meier 44efa0ed2e Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_timeout_add()     ==> g_timeout_add
   gtk_timeout_remove()  ==> g_source_remove()

Also: timer callback should return gboolean (not void or gint)

svn path=/trunk/; revision=25672
2008-07-08 02:25:30 +00:00
Jeff Morriss 83f9ecf96f Move privileges.c and unicode-utils.c from epan to wsutil (so things like
capinfos and dumpcap don't need to depend on libwireshark nor directly pull
in those modules).  Because capinfos and editcap were only being linked with
privileges.c if we had plugins, this allows those programs to be linked when
someone is compiling --without-plugins.

svn path=/trunk/; revision=25640
2008-06-30 17:16:29 +00:00
Gerald Combs 6d4f9c1eda When we open a debug console on Windows, don't grab stdin. We never read
anything on this particular console, and if we open stdin here we can't
read a capture from an anonymous pipe.

svn path=/trunk/; revision=25638
2008-06-30 16:36:37 +00:00
Bill Meier 56206e0002 Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_container_border_width()          ==> gtk_container_set_border_width()
  gtk_container_children()              ==> gtk_container_get_children()
  gtk_entry_new_with_max_length()       ==> gtk_entry_new(); gtk_entry_set_max_length()
  gtk_menu_append()                     ==> gtk_menu_shell_append()
  gtk_menu_prepend()                    ==> gtk_menu_shell_prepend()
  gtk_notebook_set_page()               ==> gtk_notebook_set_current_page()
  gtk_paned_gutter_size()               ==> gtk_paned_set_gutter_size()
  gtk_radio_button_group()              ==> gtk_radio_button_get_group()
  gtk_signal_connect()                  ==> g_signal_connect()
  gtk_signal_disconnect()               ==> g_signal_handler_disconnect()
  gtk_signal_emit_by_name()             ==> g_signal_emit_by_name()
  gtk_signal_handler_block_by_data()    ==> g_signal_handlers_block_matched()
  gtk_signal_handler_block_by_func()    ==> g_signal_handlers_block_by_func()
  gtk_signal_handler_unblock_by_data()  ==> g_signal-handlers_unblock_matched()
  gtk_signal_handler_unblock_by_func()  ==> g_signal-handlers_unblock_by_func()
  gtk_spin_button_get_value_as_float()  ==> gtk_spin_button_get_value()
  gtk_toggle_button_set_state()         ==> gtk_toggle_button_set_active()

svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
Sake Blok 50fa079b11 From Kovarththanan Rajaratnam (bug 2658):
Leading $ will now be propageted to display filter entry (on keyboards
where AltGr needs to be used to enter a '$').


svn path=/trunk/; revision=25632
2008-06-29 12:55:14 +00:00
Guy Harris c4932893e3 Have separate callback mechanisms in file.c and capture.c; pass the
capture callbacks the capture_options * as its second argument in all
cases.  This makes it a bit clearer what arguments callbacks take, and
means we can get rid of all global_capture_opts references in
gtk/main_statusbar.c.

Put the interface between gtk/main.c and gtk/main_statusbar.c into a
private header.

svn path=/trunk/; revision=25576
2008-06-24 08:05:45 +00:00
Guy Harris 0b1a0718ce Get rid of the static capture_opts pointer - it collides with parameter
names, as noted by John Smith.

svn path=/trunk/; revision=25546
2008-06-23 20:29:13 +00:00
Stig Bjørlykke 01de1202bc Update the statusbar expert info icon when changing profile.
svn path=/trunk/; revision=25491
2008-06-19 21:56:25 +00:00
Stig Bjørlykke 52bb83fd57 Reload the interface list on the welcome page when changing profile and
after editing the interface options.

svn path=/trunk/; revision=25479
2008-06-18 20:14:28 +00:00
Stig Bjørlykke d69f8cd46c The recent.gui_time_precision fix introduced a worse bug when changing
profiles, so I revert this and will investigate some more...

svn path=/trunk/; revision=25469
2008-06-17 20:37:34 +00:00
Stig Bjørlykke b82eba3f42 Initialize recent.gui_time_precision when changing profile to avoid a crash
in some rare cases.

svn path=/trunk/; revision=25457
2008-06-15 20:53:06 +00:00
Jeff Morriss a5cee04fad Move the file utility functions from wiretap to libwsutil so that
libwireshark (and the plugins using those functions) do not depend on
wiretap on Windows.

While doing that, rename the eth_* functions to ws_*.

svn path=/trunk/; revision=25354
2008-05-22 15:46:27 +00:00
Anders Broman b6454e76ac Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25244
2008-05-06 05:50:31 +00:00
Stig Bjørlykke 4674b866bc Split the recent file in two, one for the configuration profile
and one common for all profiles.  

svn path=/trunk/; revision=25186
2008-04-28 12:35:03 +00:00
Martin Mathieson d4dca0d94b Allow configuration of tap update interval.
- rename rtp_player config group to taps/statistics
- will rename prefs_rtp_player files later
  (svn didn't seem keen to rename with changes present,
   and output says its just a copy/delete anyway...)

svn path=/trunk/; revision=25133
2008-04-21 10:57:32 +00:00
Guy Harris 22ae89d766 colors_init() doesn't have anything to do with packet coloring, it's
just our initialization routine for low-level GTK+ stuff, such as
getting the system colormap and the "black" and "white" colors; we have
to call it before calling get_color().

svn path=/trunk/; revision=25090
2008-04-17 02:55:29 +00:00
Ulf Lamping 6fd6381ab3 change all preferences related filenames from xy_prefs to prefs_xy
svn path=/trunk/; revision=24975
2008-04-13 13:10:32 +00:00
Ulf Lamping 38c4ebeb4a move all code from color.c into color_utils.c
remove color.c
rename colors.h into color_utils.h (hopefully this reduces confusion to /color.h)

svn path=/trunk/; revision=24974
2008-04-13 12:41:22 +00:00
Ulf Lamping 1f8e6c08be various code cleanup
svn path=/trunk/; revision=24964
2008-04-12 23:34:44 +00:00
Ulf Lamping 660cf0a0eb move "airpcap toolbar" code from main.c into new file(s) main_airpcap_toolbar
svn path=/trunk/; revision=24961
2008-04-12 22:14:42 +00:00
Ulf Lamping 419495f71d move "filter toolbar" code from main.c into new file(s) main_filter_toolbar
svn path=/trunk/; revision=24960
2008-04-12 21:44:50 +00:00
Ulf Lamping d91e0e350a move tap_dfilter_dlg.h from / to /gtk (and use the callback mechanism in main.c instead)
svn path=/trunk/; revision=24956
2008-04-12 20:31:18 +00:00
Ulf Lamping e3a9b675d1 proto_draw -> main_proto_draw
svn path=/trunk/; revision=24954
2008-04-12 20:11:12 +00:00
Guy Harris 7e9eb5812b Clean up indentation.
svn path=/trunk/; revision=24951
2008-04-12 19:49:43 +00:00
Ulf Lamping c05af9057b rename packet_list to main_packet_list
svn path=/trunk/; revision=24950
2008-04-12 19:38:29 +00:00
Stig Bjørlykke 41e9bde037 Added an option to save column widths in the recent file.
Not 100% implemented for usage with configuration profiles with 
different column layout yet, as this requires some of the recent
values to be saved in each profile.

svn path=/trunk/; revision=24949
2008-04-12 19:37:05 +00:00
Ulf Lamping b51da2eb77 rename menu -> main_menu
remove old (and unused and confusing) ../menu.h

svn path=/trunk/; revision=24947
2008-04-12 19:18:26 +00:00
Ulf Lamping e08ae89241 cleanup of "capture_in_progress" ugly hack from main_toolbar, call capture_if_dlg directly from within main.c
svn path=/trunk/; revision=24943
2008-04-12 17:04:21 +00:00
Ulf Lamping 4151a40503 rename toolbar to main_toolbar
svn path=/trunk/; revision=24940
2008-04-12 16:38:13 +00:00
Stig Bjørlykke 5084e06a5c Mark some unused arguments.
svn path=/trunk/; revision=24939
2008-04-12 16:35:28 +00:00
Ulf Lamping 72faa680b8 move statusbar related code from main.c into it's own main_statusbar.c
svn path=/trunk/; revision=24937
2008-04-12 15:55:27 +00:00
Ulf Lamping 1dbdc34841 move drag_and_drop declarations into it's own file
svn path=/trunk/; revision=24927
2008-04-12 09:33:59 +00:00
Ulf Lamping b4f3c5fd40 compat_macros.h is gone now!!!
all GTK1 compatibility code was removed, so this file can simply be dropped

svn path=/trunk/; revision=24923
2008-04-12 01:41:53 +00:00
Ulf Lamping 55c2be83db move stock icon code from toolbar.c into specific stock_icons file(s)
svn path=/trunk/; revision=24921
2008-04-12 00:49:20 +00:00
Ulf Lamping 8e58ec7085 last round to replace SIGNAL_CONNECT with g_signal_connect
svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
Ulf Lamping c6d13dc2c8 replace WIDGET_SET_SIZE with gtk_widget_set_size_request
svn path=/trunk/; revision=24910
2008-04-11 20:31:05 +00:00
Ulf Lamping ae5f841083 replace all appearances of BUTTON_NEW_FROM_STOCK with GTK2's gtk_button_new_from_stock
svn path=/trunk/; revision=24904
2008-04-11 18:58:19 +00:00
Bill Meier b5309506a4 OBECT_..._DATA --> g_object_..._data
svn path=/trunk/; revision=24892
2008-04-11 15:41:51 +00:00
Anders Broman c973aa3830 Remove:
#ifdef NEED_G_ASCII_STRCASECMP_H
#include "g_ascii_strcasecmp.h"
#endif

svn path=/trunk/; revision=24868
2008-04-09 19:39:58 +00:00
Ulf Lamping b6c168413f fix some GTK1 related comments
svn path=/trunk/; revision=24862
2008-04-09 05:54:09 +00:00
Ulf Lamping 4214543e5a fix a comment typo
svn path=/trunk/; revision=24861
2008-04-09 05:43:07 +00:00
Ulf Lamping df724f83cd remove GTK1 specific font handling
svn path=/trunk/; revision=24842
2008-04-08 04:47:32 +00:00