Commit Graph

5133 Commits

Author SHA1 Message Date
Guy Harris 9ccf7e431e Make variables used only in file_dlg_win32.c static.
svn path=/trunk/; revision=34512
2010-10-14 09:01:12 +00:00
Guy Harris 55bc235b90 Make routines unused outside file_dlg_win32.c static.
svn path=/trunk/; revision=34511
2010-10-14 08:59:35 +00:00
Anders Broman 01a9d015d5 From Jörg Mayer:
(UIManger) Fix compilation warnings.

svn path=/trunk/; revision=34502
2010-10-13 19:04:14 +00:00
Anders Broman d1de327057 (GTKUImanger)
- Open file from the welocme screen.

svn path=/trunk/; revision=34498
2010-10-13 15:52:10 +00:00
Anders Broman 19e1998c2c (GTKUImanger)
- Make use of the new WIRESHARK_FILE_STOCK icon.
- Make clearing of recent files work.
- Make the recent file list in the Welcome menu work again.

svn path=/trunk/; revision=34497
2010-10-13 11:22:23 +00:00
Anders Broman 5bfb661d23 Add a wireshark file stock icon.
svn path=/trunk/; revision=34496
2010-10-13 11:15:11 +00:00
Anders Broman fde95120d2 Try to get the build going again.
svn path=/trunk/; revision=34495
2010-10-13 04:29:07 +00:00
Anders Broman ebb3a7f694 (GUIManager) Base code to get recent files to work with GUIManager.
Based on code from http://people.gnome.org/~ebassi/recent-uimanager-inline.c by Emmanuele Bassi.

svn path=/trunk/; revision=34493
2010-10-12 21:33:08 +00:00
Bill Meier 2e4f755e13 Define some vars & fcns as static;
Also: do some minor reformmating and cleanup of whitespace.

svn path=/trunk/; revision=34492
2010-10-12 19:26:07 +00:00
Bill Meier 2b0f6a63f1 Define some fcns & vars as static;
Rename g_capture_in_progress to gbl_capture_in_progress (capture_if_dlg.c)
Do some whitespace cleanup.

svn path=/trunk/; revision=34490
2010-10-12 17:39:44 +00:00
Bill Meier 2d3abb5cec Minor cleanup of the global name space:
- Define some vars as static;
- Rename some externs to be less generic;
Also: cleanup some whitespace.

svn path=/trunk/; revision=34489
2010-10-12 16:42:02 +00:00
Bill Meier c004d57361 Minor cleanup of the global namespace:
- Define some fcns and vars as static;
- Use less generic names for certain externs;
Also: Remove some usused #defines & cleanup some whitespace


svn path=/trunk/; revision=34488
2010-10-12 16:05:19 +00:00
Bill Meier c78221d4ce Rename g_resolv_flags --> gbl_resolv_flags; Also: cleanup some whitespace & indentation.
svn path=/trunk/; revision=34487
2010-10-12 13:15:08 +00:00
Anders Broman 6e31c8c406 It's no longer neccesarry to set the E_DFILTER_TE_KEY on the popup_menu objects.
svn path=/trunk/; revision=34486
2010-10-12 07:41:18 +00:00
Guy Harris 3c27b97c26 Get rid of C++-style comments; use #if 0/#endif to remove code.
svn path=/trunk/; revision=34485
2010-10-12 01:27:58 +00:00
Anders Broman 24d4eda023 menus.c: In function 'add_menu_recent_capture_file_absolute':
menus.c:4583: warning: unused variable 'recent_files_list'

svn path=/trunk/; revision=34479
2010-10-11 20:05:49 +00:00
Anders Broman eb007bae23 Get filter_te from top_level rather then from the widget.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5288

svn path=/trunk/; revision=34478
2010-10-11 19:29:52 +00:00
Stig Bjørlykke 32da2562b8 We set sensitivity on the map button in ct_nb_map_switch_page_cb().
svn path=/trunk/; revision=34469
2010-10-11 08:29:25 +00:00
Stig Bjørlykke ce8e4aa47c Don't add a border around the main window, this looks bad in the new
Ubuntu release.

svn path=/trunk/; revision=34468
2010-10-11 08:28:38 +00:00
Bill Meier 09d718f723 Rename vals_status & vals_pdu_type to wsp_vals_status & wsp_vals_pdu_type
svn path=/trunk/; revision=34463
2010-10-10 20:45:19 +00:00
Guy Harris 708e2d905b Fix build.
svn path=/trunk/; revision=34456
2010-10-10 19:42:30 +00:00
Anders Broman 45371fce82 - Fix more callbacks.
When using the GUImanager the callback signature is (GtkAction *action , gpointer user_data) which causes problems when retreiveing
object data stored with the widget such as the filter box widget.

Work around that problem by doing
	filter_cm = g_object_get_data(G_OBJECT(top_level), E_DFILTER_CM_KEY);
	filter_te = gtk_bin_get_child(GTK_BIN(filter_cm));
in the follow_udp/tcp/ssl_stream.

svn path=/trunk/; revision=34455
2010-10-10 19:33:42 +00:00
Guy Harris f9371b0e0b It's now "change column", not just "rename column"; fix build.
Clean up indentation.

svn path=/trunk/; revision=34454
2010-10-10 19:05:04 +00:00
Anders Broman dc03d627d7 Fix up a number of callbacks.
Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5288
requires abit of reworking of the callbacks or a different aproach to setting object data.

svn path=/trunk/; revision=34453
2010-10-10 18:10:33 +00:00
Stig Bjørlykke 7bb2c88475 Fix menu entry.
svn path=/trunk/; revision=34447
2010-10-09 18:41:46 +00:00
Stig Bjørlykke 2ed80dc7ba Fix menu entries.
svn path=/trunk/; revision=34446
2010-10-09 18:38:25 +00:00
Stig Bjørlykke 4ce3021a07 Prefix window title with "Wireshark".
svn path=/trunk/; revision=34445
2010-10-09 18:37:31 +00:00
Stig Bjørlykke ccfe41300c Added "Edit Column Details" functions to the packet list heading popup.
Removed "Rename Column Title" as this is moved to "Edit Column Details".

svn path=/trunk/; revision=34444
2010-10-09 15:22:53 +00:00
Stig Bjørlykke 20cdf3194c From Alexander Koeppe via bug 5287:
Correct order of Window Scaling Graph in Graph control box.

svn path=/trunk/; revision=34443
2010-10-09 11:37:57 +00:00
Stig Bjørlykke 06a60e48c3 Show custom column occurrence in the packet list heading tooltips.
svn path=/trunk/; revision=34434
2010-10-08 11:08:36 +00:00
Anders Broman 0135435c0f Get rid of an GUI artifact if the recent list is empty.
svn path=/trunk/; revision=34431
2010-10-08 06:05:06 +00:00
Guy Harris a9e7cb04cc Make some routines unused outside gtk/menus.c static.
svn path=/trunk/; revision=34430
2010-10-08 03:09:15 +00:00
Guy Harris e6894e3175 Fix a routine name - that menu item has nothing to do with colorization.
svn path=/trunk/; revision=34429
2010-10-08 03:00:54 +00:00
Guy Harris cf6b73afed Clean up white space.
set_menu_object_data_meat_old() is only used with main_menu_factory;
simplify it.

Add some comments to #else's and #endif's.

svn path=/trunk/; revision=34428
2010-10-08 02:38:47 +00:00
Guy Harris 186ad7c299 set_menu_sensitivity_old() is now only used for the main menu; simplify
it accordingly.

svn path=/trunk/; revision=34427
2010-10-08 02:17:37 +00:00
Guy Harris d4c3cbea6d Move a comment next to the only item to which it now refers.
svn path=/trunk/; revision=34425
2010-10-08 01:38:12 +00:00
Guy Harris 1e2d185461 Clean up white space.
svn path=/trunk/; revision=34423
2010-10-08 01:31:47 +00:00
Guy Harris bb5e9d6d01 Move menu_items[] inside the #ifdef MAIN_MENU_USE_UIMANAGER/#else/#endif
that has the main menu stuff for when we *are* using GTKUIManager.

svn path=/trunk/; revision=34422
2010-10-08 01:22:54 +00:00
Guy Harris 832f622237 Use #error to cause the build to fail for un-implemented stuff (such as
"GTKUIManager with the old packet list").

Replicate the "don't do silly stuff such as using Control+A for anything
other than Select All" comment near the place where the main menu is
defined if we're using GTKUIManager.

svn path=/trunk/; revision=34419
2010-10-08 00:33:38 +00:00
Anders Broman a7c4d6ea06 Reinsert #ifdef's removed by mistake.
svn path=/trunk/; revision=34404
2010-10-07 15:58:10 +00:00
Anders Broman 914a6d47d7 Remove #ifdef'ed code for MENUS_USE_UIMANAGER.
svn path=/trunk/; revision=34403
2010-10-07 15:23:45 +00:00
Martin Mathieson 62e6b6aceb Add more CRC failure codes.
svn path=/trunk/; revision=34401
2010-10-07 14:44:00 +00:00
Anders Broman 3e39a7382f From Alexander Koeppe:
New TCP Graph - Window Scaling.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5276

svn path=/trunk/; revision=34393
2010-10-06 05:48:01 +00:00
Jeff Morriss 5af01ed393 Add (a copy of) glib's g_strv_length() if we have glib < 2.6
svn path=/trunk/; revision=34380
2010-10-05 13:28:57 +00:00
Stig Bjørlykke fb0621683d Split some texts on the welcome page to make "Interface List" and
"Capture Help" smaller to make room for longer filenames in the
Open Recent list.

svn path=/trunk/; revision=34379
2010-10-05 06:59:11 +00:00
Stig Bjørlykke 738c0ace24 From Jose Pico via bug 5272:
Export Object SMB functionality fixes.

svn path=/trunk/; revision=34365
2010-10-04 12:19:58 +00:00
Anders Broman 5ecf33cbc6 (GUIManager)set time display format(makes file load work again).
svn path=/trunk/; revision=34364
2010-10-04 11:21:01 +00:00
Stig Bjørlykke ac7c3787b5 Explain BPF in the tooltips for "Compile BPF".
svn path=/trunk/; revision=34363
2010-10-04 11:04:13 +00:00
Anders Broman e66c219596 (GUIManager)set_menu_sensitivity_old not used when MENUS_USE_UIMANAGER defined.
svn path=/trunk/; revision=34361
2010-10-04 10:36:38 +00:00
Stig Bjørlykke 6e5dea0171 Added some defines to make it compile with MAIN_MENU_USE_UIMANAGER.
svn path=/trunk/; revision=34360
2010-10-04 08:43:15 +00:00
Anders Broman c7bce2e142 Mark unused parameters as unused.
svn path=/trunk/; revision=34359
2010-10-04 08:01:55 +00:00
Sake Blok d2ea494622 Add a cast to make the OSX-PPC buildbot happy.
Removed debugging commenting-out that slipped through...


svn path=/trunk/; revision=34353
2010-10-03 19:28:05 +00:00
Anders Broman ff72f80ecd [GTKUImanagerFix a typo and a callback.
svn path=/trunk/; revision=34352
2010-10-03 19:11:10 +00:00
Anders Broman 425ead9128 [GTKUImanager]Fix Help callbacks.
svn path=/trunk/; revision=34349
2010-10-03 17:37:43 +00:00
Stig Bjørlykke 0cb22a7c23 Added a missing separator.
svn path=/trunk/; revision=34347
2010-10-03 16:37:58 +00:00
Stig Bjørlykke 0ca8c586d3 Use UTF8_HORIZONTAL_ELLIPSIS instead of "..." in menus.
svn path=/trunk/; revision=34346
2010-10-03 16:09:25 +00:00
Stig Bjørlykke 25d8d91add Use correct text for "Not Selected".
svn path=/trunk/; revision=34344
2010-10-03 15:26:03 +00:00
Stig Bjørlykke e07ef26e9a Add the missing "... or not Selected".
svn path=/trunk/; revision=34343
2010-10-03 15:22:16 +00:00
Stig Bjørlykke 229df68593 Use correct text for "Not Selected".
svn path=/trunk/; revision=34342
2010-10-03 15:10:29 +00:00
Sake Blok f3e94f6753 Retry of SVN 34338, now tested on my WinXP dev VM:
Use pcap_open_dead instead of pcap_create for the compile BPF button. 



svn path=/trunk/; revision=34340
2010-10-03 12:04:18 +00:00
Sake Blok a301593846 Reverting SVN 34338, looks like libpcap and winpcap are more different than I thought. I might have to set up a local windows build system again :(
svn path=/trunk/; revision=34339
2010-10-02 21:15:20 +00:00
Sake Blok 1e01a2889b Use pcap_open_dead instead of pcap_create for the compile BPF button. This makes the button available on systems which do not have libraries that have pcap_create (like Windows for example)
Change a couple of values into defined constants.


svn path=/trunk/; revision=34338
2010-10-02 20:26:09 +00:00
Stig Bjørlykke 2e560e12a9 Ensure we always show the selected frame when changing sort order.
svn path=/trunk/; revision=34337
2010-10-02 16:41:20 +00:00
Bill Meier b24ef36cc0 Fix a compilation error
svn path=/trunk/; revision=34335
2010-10-02 15:15:40 +00:00
Sake Blok 3664650ead Make capture filter syntax checking independent of pcap_create by using pcap_compile_nopcap
svn path=/trunk/; revision=34333
2010-10-02 14:47:41 +00:00
Sake Blok 2ca8b0aab7 Check for HAVE_PCAP_CREATE in a few more spots to fix building on systems with a pcap-library that does not support pcap_create
svn path=/trunk/; revision=34331
2010-10-02 12:24:28 +00:00
Sake Blok 9cde3f3f20 Add syntax checking to the capture filter text entry in the capture setup screen. Since capture filters are DLT dependent, it is not useful to do syntax checking in the capture filter dialog (unless we check each filter against every possible DLT)
svn path=/trunk/; revision=34330
2010-10-02 11:29:26 +00:00
Sake Blok 34fdc9c7a9 When a user selected a non-default DLT for the interface, change the DLT to the user-selected DLT before compiling the BPF code.
svn path=/trunk/; revision=34329
2010-10-02 11:07:50 +00:00
Sake Blok 98c8dc0319 pcap_activate needs to be called to set the DLT of the selected interface, otherwise the BPF filter is compiled with a DLT of NULL, which will make a filter like "ether host 00:00:00:00:00:00" fail to compile.
svn path=/trunk/; revision=34328
2010-10-02 10:28:18 +00:00
Sake Blok 2bffa17891 Add navigation to previous/next packets in the conversation. It will check TCP and UDP first and if this is not TCP or UDP, it will use IP.
Accelerator keys:

<ctrl>+[   Goto Previous Packet In Conversation
<ctrl>+]   Goto Next Packet In Conversation



svn path=/trunk/; revision=34319
2010-10-01 22:46:30 +00:00
Anders Broman 316e50f8cd [GTKUImanager]Fix faulty paths.
svn path=/trunk/; revision=34318
2010-10-01 21:46:16 +00:00
Stig Bjørlykke e18935acfd GTK_STOCK_EDIT came in gtk 2.6.0
svn path=/trunk/; revision=34317
2010-10-01 19:23:15 +00:00
Martin Mathieson 46a5047471 Initialize a variable to avoid a (bogus) gcc warning.
svn path=/trunk/; revision=34313
2010-10-01 17:03:39 +00:00
Stig Bjørlykke 98f6aa9311 Add a new right-click popup menu for the statusbar profiles for easy functions
to create new, copy, delete and rename configuration profiles.

svn path=/trunk/; revision=34312
2010-10-01 16:29:37 +00:00
Jeff Morriss 089c063192 (GtkUIManager) view_menu_colorize_auto_scroll_live_cb(): check if we got a widget before dereferencing it. Not sure if this is just hiding another bug, but it lets Wireshark start.
svn path=/trunk/; revision=34310
2010-10-01 14:39:35 +00:00
Anders Broman a1087a7bdb (GUIManager)Try to fix the time format issue.
svn path=/trunk/; revision=34309
2010-10-01 14:20:59 +00:00
Jeff Morriss f0598543d9 (GUIManager) Rename prefs_cb() to menus_prefs_cb() to avoid conflict with the (extern'd) prefs_cb() in prefs_dlg.h
svn path=/trunk/; revision=34302
2010-09-30 21:56:47 +00:00
Anders Broman a11667bcae [GTKUImanager] Fix a few callbacks, use #defines for strings.
svn path=/trunk/; revision=34299
2010-09-30 21:23:49 +00:00
Stig Bjørlykke bd47db5055 Indicate that the selected display filter is applied by disabling the "Apply"
button.  Indicate that no filter is applied by disabling the "Clear" button.

svn path=/trunk/; revision=34288
2010-09-30 17:27:08 +00:00
Anders Broman df5a2fc900 Further GUIManager updates.
svn path=/trunk/; revision=34281
2010-09-29 16:09:42 +00:00
Jörg Mayer 362118a292 Compile failed because of text after #endif
svn path=/trunk/; revision=34276
2010-09-28 21:04:48 +00:00
Anders Broman 8dc2ef0004 Update GUIManager menubar code.
svn path=/trunk/; revision=34275
2010-09-28 20:27:28 +00:00
Stephen Fisher 2c3fe49a03 Format changes from r34265 to fit a 80 column wide window.
svn path=/trunk/; revision=34268
2010-09-27 21:23:29 +00:00
Stephen Fisher eb27557794 Fix bug #553 by ensuring that the upper-left corner of Wireshark is within the viewable area of the monitor.
svn path=/trunk/; revision=34265
2010-09-27 20:02:54 +00:00
Anders Broman 70ca54ad1e GUImanager: Add missing set_menu_sensitivity().
svn path=/trunk/; revision=34257
2010-09-26 18:14:44 +00:00
Stig Bjørlykke 93633b301f Allow creating a filter from a multi occurrence field if only one
value is present.

svn path=/trunk/; revision=34252
2010-09-26 10:54:12 +00:00
Guy Harris d14653afc2 More whitespace cleanups.
svn path=/trunk/; revision=34251
2010-09-25 19:05:18 +00:00
Guy Harris 8d46ec1533 Clean up indentation.
svn path=/trunk/; revision=34250
2010-09-25 18:44:20 +00:00
Sake Blok 7ec231f7f1 Fix the output of columns with "show resolved" disabled when all occurrences are displayed.
Limit the input field for occurrence to 4 characters to prevent an overflow.
Make sure "... as filter" does not result in an invalid filter string if all occurrences are displayed.


svn path=/trunk/; revision=34247
2010-09-25 09:33:29 +00:00
Anders Broman f442f4fe49 Further GUIManager updates, the basics are now there.
svn path=/trunk/; revision=34237
2010-09-24 14:52:44 +00:00
Stig Bjørlykke a777700ac7 Disable the "File Set" menu while capturing, because changing file while
capturing causes an assert in cf_reset_state().

We still get this assert if the "List Files" dialog is opened before we start
capture and we change file during capturing.  Maybe we have to close this
dialog when starting capture?  Or maybe disable all files except the one
being captured to?  Then we also may have to update the "Last Modified" and 
"Size" columns.

svn path=/trunk/; revision=34234
2010-09-24 12:39:15 +00:00
Anders Broman 8fbb2be4f9 Update GUIManager menubar code.
svn path=/trunk/; revision=34232
2010-09-24 06:46:14 +00:00
Bill Meier 838ffd0c72 Fix crash creating a filter (using "Expression ...") for a field with an extended value_string
svn path=/trunk/; revision=34223
2010-09-23 20:45:22 +00:00
Stig Bjørlykke f5ab6c1930 Store "Show Resolved" setting for custom columns.
svn path=/trunk/; revision=34220
2010-09-23 19:41:55 +00:00
Stig Bjørlykke a1b2b3cbcb Do not set custom occurrence in recent file, this is used for column width.
svn path=/trunk/; revision=34219
2010-09-23 19:36:09 +00:00
Stig Bjørlykke 3061558a4c Disable sorting while capturing.
svn path=/trunk/; revision=34216
2010-09-23 18:07:49 +00:00
Jörg Mayer de68ad3066 H. Sivank <hsivank@gmail.com>
I try to configure Wireshark with cmake on macosx 10.6.
It fails with : set_target_properties called with incorrect number of arguments.
Attached a patch to fix this issue.


svn path=/trunk/; revision=34201
2010-09-23 07:02:33 +00:00
Jörg Mayer 95ddff9f17 Put the guides into the "guides" subdirectory of DOC_DIR
svn path=/trunk/; revision=34197
2010-09-23 06:53:40 +00:00
Sake Blok 7364bef1b3 When using a custom column, make it possible to select which occurrence to show if the field has multiple occurrences.
svn path=/trunk/; revision=34186
2010-09-22 20:56:14 +00:00
Jaap Keuter e4b94c0d8f Fix for bug 5172:
Properly retrieve the H.245 endpoint IP address.

svn path=/trunk/; revision=34184
2010-09-22 16:35:02 +00:00
Stig Bjørlykke ca5fd0c797 Make it compile.
svn path=/trunk/; revision=34175
2010-09-21 09:59:45 +00:00
Guy Harris 7ee31c94d7 Move a bunch of definitions before the code that uses at least one of
the variables in question.

svn path=/trunk/; revision=34174
2010-09-21 09:53:44 +00:00
Anders Broman 8c964f34cf Try to fix:
"In menus_init() you seem to use ui_manager_packet_list_heading before it's initialized."

svn path=/trunk/; revision=34173
2010-09-21 09:30:16 +00:00
Guy Harris ef4a2e73b0 Get rid of C++ comment.
svn path=/trunk/; revision=34171
2010-09-21 07:17:20 +00:00
Stig Bjørlykke c2e11e06be Make "Displayed Columns" work yet again, as done in revision 34160.
Bring back 'Resize Column' and 'Rename Column Title'.

svn path=/trunk/; revision=34170
2010-09-21 07:08:35 +00:00
Guy Harris 4eaaf279d0 Fix comments.
svn path=/trunk/; revision=34169
2010-09-21 05:58:14 +00:00
Anders Broman 838aa2db49 Update GUIManager menubar code(#IF 0 ).
svn path=/trunk/; revision=34168
2010-09-21 05:32:32 +00:00
Anders Broman f62d9d36cc Wrong signature used for a GtkToggleActionEntry callback.
svn path=/trunk/; revision=34167
2010-09-21 05:24:02 +00:00
Anders Broman c237a52cca Remove leftover debug code/comment
svn path=/trunk/; revision=34166
2010-09-21 05:10:38 +00:00
Stig Bjørlykke 1bc7a24d9b Make "Displayed Columns" work again.
svn path=/trunk/; revision=34160
2010-09-20 13:11:48 +00:00
Jeff Morriss 20cc0d7ce9 Don't include stock icons that we no longer use.
svn path=/trunk/; revision=34150
2010-09-17 13:38:09 +00:00
Anders Broman 0519ad45f3 Use GTK dialog stock icons rather than our own.
svn path=/trunk/; revision=34149
2010-09-17 12:54:07 +00:00
Guy Harris ae13a7ce0c Fix some bugs that show up when you build with the old packet list.
svn path=/trunk/; revision=34148
2010-09-17 08:48:19 +00:00
Guy Harris 5f7787d9ec Use the same control sequences for the old packet list that are used for
the new packet list.

svn path=/trunk/; revision=34144
2010-09-17 04:58:30 +00:00
Gerald Combs a87bdf9660 Turn on ASLR via /DYNAMICBASE and DEP via SetProcessDEPPolicy().
svn path=/trunk/; revision=34137
2010-09-16 19:20:06 +00:00
Jeff Morriss b6e984c095 #if out ui_desc_conv_filter_popup to get the builds going (it looks like it should be used but it isn't currently).
svn path=/trunk/; revision=34135
2010-09-16 13:12:02 +00:00
Anders Broman 0b44725f9f Fix a typo.
svn path=/trunk/; revision=34133
2010-09-16 10:40:33 +00:00
Guy Harris 8c5d32aa8f Remove C++ comments.
svn path=/trunk/; revision=34132
2010-09-16 08:58:46 +00:00
Anders Broman 57f8d0373d menus.c:1508: warning: unused parameter 'current'
menus.c:1508: warning: unused parameter 'user_data'
Mark parameters as unused.

svn path=/trunk/; revision=34131
2010-09-16 08:15:45 +00:00
Anders Broman 55580a9662 Use GUIManager for the pop-up:s.
Can be dissabled by commenting out 
#define MENUS_USE_UIMANAGER 1

svn path=/trunk/; revision=34130
2010-09-16 07:48:18 +00:00
Anders Broman 8421bbd8a3 Add more GUIManager code #ifdef:ed out.
The popups should be working now exept for protocol help.
Help with testing and cleaning up apreciated.
GTK 2.6 requred, I'll look into that too later if no one beats me to it.

svn path=/trunk/; revision=34127
2010-09-15 20:51:44 +00:00
Anders Broman 31cf5ad237 Add more GUIManager code #ifdef:ed out
svn path=/trunk/; revision=34118
2010-09-14 20:50:03 +00:00
Anders Broman 7768145b5e Add more GUIManager code #ifdef:ed out
svn path=/trunk/; revision=34112
2010-09-13 20:21:41 +00:00
Guy Harris 82ed2ba728 set_menu_sensitivity() is used only if MENUS_USE_UIMANAGER is defined,
so define it only if MENUS_USE_UIMANAGER is defined.

Clean up indentation.

svn path=/trunk/; revision=34109
2010-09-12 22:36:52 +00:00
Guy Harris 9583a67e2d Get rid of /* within comment, clean up white space.
svn path=/trunk/; revision=34108
2010-09-12 21:53:26 +00:00
Anders Broman b1d1e4bda6 Add more GUIManager code #ifdef:ed out
svn path=/trunk/; revision=34106
2010-09-12 19:26:42 +00:00
Bill Meier 8b7784d08e Remove what appear to be two redundant lines of code (AFAIKT).
svn path=/trunk/; revision=34090
2010-09-09 17:30:35 +00:00
Stephen Fisher 137054603c Resolve another issue the Windows buildbots are having after rev 34084:
guint8 -> guint16 for th_flags variable in segment struct.



svn path=/trunk/; revision=34089
2010-09-09 15:46:40 +00:00
Stephen Fisher f18fe680e4 These two capture option variables are defined by capture_opts_init(), so
don't redefine them to new values.


svn path=/trunk/; revision=34073
2010-09-07 19:22:05 +00:00
Anders Broman 24f4f3bd05 Start adding GTKUIManager code.(#IF 0'ed out.).
svn path=/trunk/; revision=34071
2010-09-07 08:10:45 +00:00
Martin Mathieson 8c258c3452 Change bandwidth labels, and update stop time even on first frame.
svn path=/trunk/; revision=34068
2010-09-06 09:22:43 +00:00
Martin Mathieson 4b5c69c0d9 Add bandwidth figures per UE.
svn path=/trunk/; revision=34061
2010-09-03 16:45:05 +00:00
Martin Mathieson d96bda809e Try to cast away windows buildbot problems.
svn path=/trunk/; revision=34060
2010-09-03 16:05:01 +00:00
Martin Mathieson 055d654cc2 Add bandwidth figures to RLC stats (per-UE and per-channel).
svn path=/trunk/; revision=34059
2010-09-03 15:22:28 +00:00
Stig Bjørlykke 7ac2adc395 Increase maximum number of nodes to 40.
10 is in some situations too few.

svn path=/trunk/; revision=34057
2010-09-03 09:12:40 +00:00
Anders Broman f92d65f0cb Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34054
2010-09-03 08:41:04 +00:00
Anders Broman 5cd5da38d2 Add doxygen coments.
svn path=/trunk/; revision=34052
2010-09-03 07:27:59 +00:00
Anders Broman 851d48863c Add a comment
svn path=/trunk/; revision=34051
2010-09-03 07:25:51 +00:00
Anders Broman 9ebaecb807 Add comments
svn path=/trunk/; revision=34047
2010-09-02 19:23:01 +00:00
Anders Broman 3a5f906a72 Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34043
2010-09-02 15:39:15 +00:00
Anders Broman b6fc233757 Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34042
2010-09-02 15:38:04 +00:00
Anders Broman f32d9a570c Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34041
2010-09-02 06:34:04 +00:00
Anders Broman 9b8d6c102c Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34040
2010-09-02 06:22:12 +00:00
Anders Broman 0df3d83670 1.4 version does not display the t.38 graph.
(init/remove tap_listener missing)

svn path=/trunk/; revision=34038
2010-09-01 19:42:59 +00:00
Guy Harris ca02af3248 Expand and update comments.
svn path=/trunk/; revision=34037
2010-09-01 17:49:27 +00:00
Anders Broman 5ed4941636 From Jaap Keuter:
Fix Wireshark don't show mgcp calls in "Telephony" => "VoIP calls"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5167

svn path=/trunk/; revision=34036
2010-09-01 12:39:29 +00:00
Stig Bjørlykke fe341f145a Ensure we always update the display filter when changing profile.
svn path=/trunk/; revision=34030
2010-08-31 07:53:51 +00:00
Anders Broman 761149722e Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34029
2010-08-31 05:48:12 +00:00
Bill Meier a35e5c72e9 Add #include <stdio.h> for fprintf
svn path=/trunk/; revision=34028
2010-08-30 23:58:19 +00:00
Anders Broman f51ed4d4c3 Remove the depricated GtkItemFactory code.
svn path=/trunk/; revision=34027
2010-08-30 20:30:20 +00:00
Anders Broman 749c891a91 Switch to GTK UIManager.
svn path=/trunk/; revision=34026
2010-08-30 19:49:57 +00:00
Jeff Morriss 8016df02f1 Include stdio.h. Fixup indent some.
svn path=/trunk/; revision=34025
2010-08-30 19:14:54 +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
Anders Broman 6e5a0a481f Remove a redundant callback.
svn path=/trunk/; revision=34015
2010-08-30 14:32:38 +00:00
Anders Broman 60f258b4e5 Convert to GTKUIManager
svn path=/trunk/; revision=34014
2010-08-30 14:23:25 +00:00
Stig Bjørlykke 835a43312f Always update the display filter when changing a display filter macro
and when changing profile.  Not sure why I have to invalidate cfile.dfilter
in macro_update(), because this will be done in macros_post_update(),
but unless this we get a crash when renaming a macro...

This is a fix for bug 5002.

svn path=/trunk/; revision=34011
2010-08-30 08:47:26 +00:00
Anders Broman 6d0780b8ba Make a note about how to "activare" the filter popup.
svn path=/trunk/; revision=34008
2010-08-30 05:12:27 +00:00
Anders Broman 21107dff38 Switch to GTK UIManager.
svn path=/trunk/; revision=34002
2010-08-29 19:37:15 +00:00
Anders Broman 0042c07d2a Doxygen changes.
svn path=/trunk/; revision=33993
2010-08-29 15:14:38 +00:00
Anders Broman 46b05449ce Doxygen changes.
svn path=/trunk/; revision=33991
2010-08-29 13:18:58 +00:00
Gerald Combs 5aae07254f Forward-port r33953.
Move the SetDllDirectory calls to ws_init_dll_search_path. If
SetDllDirectory fails, pass the Wireshark program path to
SetCurrentDirectory.

svn path=/trunk/; revision=33958
2010-08-27 19:24:44 +00:00
Anders Broman d936d457c3 Fix a number of doxygen directives.
svn path=/trunk/; revision=33929
2010-08-26 15:02:27 +00:00
Anders Broman 74131df4f0 - Try to fix a couple of doxygen comments.
svn path=/trunk/; revision=33927
2010-08-26 07:12:03 +00:00
Anders Broman 48ac5f90ff - Try to fix a couple of doxygen comments.
- whitspace changes.

svn path=/trunk/; revision=33926
2010-08-26 06:46:30 +00:00
Gerald Combs 607b228df6 Add ws_load_library and ws_module_open, which respectively call
LoadLibrary and g_module_open only for the program directory and system
directory on Windows. Use them to replace a bunch of LoadLibrary and
g_module_open calls. Use the extension ".dll" for all the DLLs that we
load. Add comments about DLL loading in Python.

svn path=/trunk/; revision=33924
2010-08-25 20:30:59 +00:00
Gerald Combs ad4ffa5d49 Partial fix for bug 5133. On Windows, call SetDllDirectory at startup if
it's present in Wireshark and dumpcap. This takes care of the airpcap.dll
PoC but we need to load wpcap.dll from a full path. We might want to
call SetDllDirectory from our other executables as well.

svn path=/trunk/; revision=33916
2010-08-24 23:39:29 +00:00
Anders Broman 5fbc1e101b Make the expert filter popup behave as in filter_utils.
svn path=/trunk/; revision=33915
2010-08-24 20:03:33 +00:00
Anders Broman 7e8752c70c Change the wording in the menu.
svn path=/trunk/; revision=33902
2010-08-24 05:11:37 +00:00
Bill Meier e5fc612fb2 Use consistent indentation;
Fix a few @param comments.

svn path=/trunk/; revision=33901
2010-08-24 00:25:50 +00:00
Bill Meier 66d340863f (Minor) Cleanup signal callbak signatures and related:
- Don't mark callback arg as _U_ if actually used (and vice-versa);
- Use Null as user_data in g_signal_callback if unused in callback;
- Use correct signature for certain event callbacks.

svn path=/trunk/; revision=33895
2010-08-23 19:29:08 +00:00
Bill Meier 32f17466e3 [Trivial] Use g_signal_connect() instead of g_signal_connect_data().
svn path=/trunk/; revision=33893
2010-08-23 16:48:42 +00:00
Bill Meier e637e22313 (Trivial) Use consistent indentation.
svn path=/trunk/; revision=33892
2010-08-23 16:39:52 +00:00
Jeff Morriss bcca3fb3d5 Remove #if 0'd out code (dfilter_combo_add_empty()).
svn path=/trunk/; revision=33891
2010-08-23 16:18:06 +00:00
Bill Meier 9451aa90a7 (Trivial/Cosmetic) Fix signatures of some signal callback functions;
Also:Add some missing G_CALLBACKs (even in commented out code)

svn path=/trunk/; revision=33890
2010-08-23 15:58:48 +00:00
Bill Meier 254135d807 (Trivial) Whitespace cleanup.
svn path=/trunk/; revision=33889
2010-08-23 14:36:01 +00:00
Bill Meier 539712c5ad new_packet_list_column_button_pressed_cb(): return gboolean (not void): it's an event callback;
Note:
 the original code:
   static void new_packet_list_column_button_pressed_cb() {
     ...
     packet_list_popup(...);
     }
 the revised code:
   static gboolean new_packet_list_column_button_pressed_cb() {
     ...
     return packet_list_popup(...);
     }

 My guess is that the original code happened to work 
 on some?/all? supported platforms depending upon the actual
 details of the generated calling_sequence/return code.
---------------
Also: 
- new_packet_list_column_button_pressed_cb(): 'path' arg is unused;
- new_packet_list_double_click_cb(): user_data arg is unused so 
  don't supply same in the g_signal_connect.

svn path=/trunk/; revision=33888
2010-08-23 14:08:35 +00:00
Gerald Combs 31e1d6463f Initialize a variable before we try to free it.
svn path=/trunk/; revision=33877
2010-08-21 16:38:13 +00:00
Bill Meier ae6bc8734c Use GType instead of deprecated GtkType
svn path=/trunk/; revision=33875
2010-08-21 13:21:35 +00:00
Jeff Morriss 000b99fc5f Free the err_str from capture_interface_list() even if the error isn't CANT_GET_INTERFACE_LIST.
svn path=/trunk/; revision=33866
2010-08-20 22:15:07 +00:00
Jeff Morriss 522c9b85b8 Don't leak the memory used by the original title when we're appending the version to it.
svn path=/trunk/; revision=33864
2010-08-20 22:12:55 +00:00
Jeff Morriss 7c9aac4d4a From Turney Cal as a followup to rev 33841 and bug 5038:
I tested your update ("wireshark -r foo.pcap" from a cmd window) and 
found that it did not use the current folder for the next Open dialog 
and didn't save the folder in recent.  The attached patch prepends the
filename with the current folder.

From me: don't leak memory when doing it.

svn path=/trunk/; revision=33863
2010-08-20 21:56:52 +00:00
Anders Broman 819f0ab85c Switch wlan_stat_dlg to use GUIManager step 2.
svn path=/trunk/; revision=33860
2010-08-20 14:19:06 +00:00
Stig Bjørlykke 4511d518b6 Use defined functions.
svn path=/trunk/; revision=33859
2010-08-20 12:05:44 +00:00
Anders Broman 9e6e00b9a5 Remove a comment.
svn path=/trunk/; revision=33858
2010-08-20 11:57:20 +00:00
Anders Broman 7b0709b3d5 Fix indentation.
svn path=/trunk/; revision=33857
2010-08-20 11:56:44 +00:00
Anders Broman 383d3d3da9 Switch wlan_stat_dlg to use GUIManager step 1.
svn path=/trunk/; revision=33856
2010-08-20 11:54:18 +00:00
Bill Meier dac7978557 Minor cleanup of rtp 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 values >= 1 sec as sec (not s000 ms);
 - Determine max yscale label width properly as the largest of the
   top or middle label lengths;
 - Cleanup some indentation.

svn path=/trunk/; revision=33855
2010-08-19 22:04:37 +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
Stig Bjørlykke ec08ecd6fe Fixed the popup menu table:
- Added missing NULL initializers
- Fixed some typos in the menu items

svn path=/trunk/; revision=33853
2010-08-19 20:11:28 +00:00
Anders Broman 4f0a8b5bec Use better naming.
svn path=/trunk/; revision=33852
2010-08-19 19:05:56 +00:00
Anders Broman ee96dd5c00 Switch over to use the GUIManager(can be turned of by a #define).
svn path=/trunk/; revision=33851
2010-08-19 19:05:11 +00:00
Bill Meier b662825831 Fix gcc compile errors....
svn path=/trunk/; revision=33850
2010-08-19 15:22:03 +00:00
Bill Meier 3911b90cde Use proper signatures for event callback functions:
EG: Non-event signal callback functions shouldn't
   be directly used as event callback functions.
Replace use of deprecated "GtkSignalFunc";
Whitespace cleanup.

svn path=/trunk/; revision=33849
2010-08-19 15:02:23 +00:00
Guy Harris 89c43c1832 Add placeholder items for ^Z as Edit->Undo, shift-^Z as Edit->Redo,
and ^A as Edit->Select All.

Add more details about implementing Undo/Redo/Cut/Copy/Paste/Select All
in the comment for the placeholder items.

svn path=/trunk/; revision=33845
2010-08-19 00:14:07 +00:00
Bill Meier 5ff36b1a2a Use correct signature for "button-press-event" callback function;
Whitespace cleanup;
Use gboolean as appropriate; 

svn path=/trunk/; revision=33844
2010-08-19 00:09:56 +00:00
Bill Meier fac1cfc492 Various minor cleanup:
- Non-event signal callback functions should return void;
 - Event signal callback had missing 'user_data' arg;
 - Rename various symbols for clarity;
 - Rename local functions with names of form gtk_...;
 - Use gboolean where appropriate;
 - Remove all 'exit(10)' statements;
 - Whitespace;
 - ...

svn path=/trunk/; revision=33843
2010-08-18 22:20:01 +00:00
Jeff Morriss 323c282897 main_cf_cb_file_read_finished(): use get_dirname() to get the directory of the
current file name.

This fixes a crash after failing to allocate some massive number of bytes if
the file name did not contain a path--which is the case when doing
"wireshark -r myfile.pcap".

svn path=/trunk/; revision=33841
2010-08-18 19:11:07 +00:00
Anders Broman d5460f420d From Cal Turney:
Restores Mark All Displayed item when all packets are displayed.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5115

svn path=/trunk/; revision=33836
2010-08-18 07:48:37 +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