Commit graph

5520 commits

Author SHA1 Message Date
Anders Broman
324477b59f Replace deprecated functions.
svn path=/trunk/; revision=38188
2011-07-24 19:39:21 +00:00
Anders Broman
5552e61f6c Replace deprecated functions.
svn path=/trunk/; revision=38187
2011-07-24 18:03:53 +00:00
Anders Broman
da955bb116 Replace deprecated functions.
svn path=/trunk/; revision=38186
2011-07-24 17:25:52 +00:00
Anders Broman
1c09e4a694 Replace deprecated functions.
Udate comments in CheckAPIs

svn path=/trunk/; revision=38185
2011-07-24 16:50:55 +00:00
Anders Broman
f34ec59889 Replace deprecated functions.
svn path=/trunk/; revision=38183
2011-07-24 15:22:21 +00:00
Anders Broman
6eb637c144 Replace depricated gdk_draw_drawable().
svn path=/trunk/; revision=38180
2011-07-24 11:35:51 +00:00
Anders Broman
5e1489efdf Try to fix "The graph is not updated when changing settings or adding new graphs.".
We need to find non deperecated equivalents...

svn path=/trunk/; revision=38179
2011-07-24 11:11:38 +00:00
Jörg Mayer
dd02027e9b Fix some compile errors when building with real gtk-3.
svn path=/trunk/; revision=38178
2011-07-24 07:59:34 +00:00
Jörg Mayer
7271b2d213 The guards for 2,22,0 are not needed, tested on a debian system with gtk 2.12.
svn path=/trunk/; revision=38177
2011-07-24 07:58:21 +00:00
Anders Broman
7cf336bbcd Fix a copy-paste error.
svn path=/trunk/; revision=38173
2011-07-23 14:02:20 +00:00
Anders Broman
858b72cd0d Use cairo for drawing to avoid deprecated functions.
I'm unsure if the #if GTK_CHECK_VERSION(2,22,0) guards are realy
needed but I don't have a GTK 2.12 system to verify with.

svn path=/trunk/; revision=38172
2011-07-23 11:27:57 +00:00
Jörg Mayer
a8f410d360 Missed gtk_orientable_set_orientation
svn path=/trunk/; revision=38162
2011-07-22 05:03:40 +00:00
Bill Meier
3160342bc0 Use correct definition for gtk_combo_box_text_new(): Fixes compile errors.
svn path=/trunk/; revision=38161
2011-07-22 01:14:10 +00:00
Jörg Mayer
58d8a2b1b2 Handle more stuff in old-gtk-compat.h to avoid guarding in the code.
svn path=/trunk/; revision=38160
2011-07-21 23:58:08 +00:00
Jörg Mayer
fc3bb80871 Add new old-gtk-compat.h to the distribution
svn path=/trunk/; revision=38154
2011-07-21 20:57:10 +00:00
Jörg Mayer
41a6524702 Update GSEAL errors
svn path=/trunk/; revision=38152
2011-07-21 20:22:16 +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
f298effccd Another one I missed.
svn path=/trunk/; revision=38149
2011-07-21 19:00:55 +00:00
Jörg Mayer
94fbcbfde6 Fix for buildbot failure. Hopefully I didn't miss too many more.
svn path=/trunk/; revision=38148
2011-07-21 18:36:17 +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
Michael Tüxen
f30c3675ec Fix issue reported by Joerg.
svn path=/trunk/; revision=38144
2011-07-21 16:00:38 +00:00
Michael Tüxen
91df20357a Make sure that the interfaces listed in ifaces really exist.
Some protection code in capture / options.
Obtained from Irene Ruengeler.


svn path=/trunk/; revision=38142
2011-07-21 15:23:46 +00:00
Michael Tüxen
5014f11884 strdup -> g_strdup.
svn path=/trunk/; revision=38141
2011-07-21 12:06:18 +00:00
Michael Tüxen
dcac95be11 Add some temporary protection code to support the current capture
options dialog box. It will be removed as soon as the capture options
dialog box supports multiple interfaces.

Received from Irene Ruengeler.


svn path=/trunk/; revision=38140
2011-07-21 11:28:16 +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
Anders Broman
c165083608 strdup -> g_strdup
svn path=/trunk/; revision=38134
2011-07-20 13:53:00 +00:00
Michael Tüxen
7a16d2fa87 Synchronize the selection of interfaces between the main welcome
window, the capture/interface dialog box and the capture / start
menu item.
Obtained from Irene Ruengeler.


svn path=/trunk/; revision=38133
2011-07-20 12:51:57 +00:00
Gerald Combs
3991a62d31 The GTK+ documentation says we can pass NULL to gtk_table_get_size(). Do
that instead of using a dummy variable.

svn path=/trunk/; revision=38127
2011-07-19 22:38:28 +00:00
Jörg Mayer
eedc9b880a Reenable the commented out code. I was able to reproducably break
the compilation but after a complete removal of the build directory
and a rebuild the problem is gone.

svn path=/trunk/; revision=38123
2011-07-19 19:36:26 +00:00
Jörg Mayer
fd42af2127 There are some undefined symbols in the code: comment out
the problematic code parts.

svn path=/trunk/; revision=38118
2011-07-19 18:00:08 +00:00
Jörg Mayer
21adeb2cfc Back out parts of 38112, as pointed out by Stig Bj\370rlykke:
The changes in profile_dlg.c, uat_gui.c and new_packet_list.c does not
work.  The tooltip is not displayed, and it's not possible to get the
context menu from a column header in the packet list.
...
I guess gtk_tree_view_column_get_widget() does not return
column->button, which is the widget we use.


svn path=/trunk/; revision=38117
2011-07-19 17:40:23 +00:00
Jörg Mayer
40cc0b57a1 Martin Mathieson: gtk_table_get_size() was only introduced in gtk 2.22
svn path=/trunk/; revision=38116
2011-07-19 17:29:27 +00:00
Martin Mathieson
049643cf28 From Pradip Biswas, bug 6127 - Added Decode for RRC BCCH (BCH and DL_SCH) messages on RLC-over-UDP.
Add separate codes/cases for BCH-over-BCH and BCH-over-DLSCH.

svn path=/trunk/; revision=38115
2011-07-19 16:41:56 +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
6d20f48e88 Fix access to the following stuctures:
GtkCheckMenuItem
GtkTable
GtkTreeViewColumn

svn path=/trunk/; revision=38112
2011-07-19 15:13:36 +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
Michael Tüxen
358fcedaba Get the interfaces list from the Capture / Interfaces list in sync
when using the capture / start menu item.

Obtained from Irene Ruengeler.

svn path=/trunk/; revision=38109
2011-07-19 12:42:18 +00:00
Jörg Mayer
4a06b078b6 Fix some errors when compiling with -DGSEAL_ENABLE.
svn path=/trunk/; revision=38108
2011-07-19 11:02:26 +00:00
Jörg Mayer
7ba73972cd Add instructions how to use the database offline (taken from
an explanation by Chris Maynard)

svn path=/trunk/; revision=38098
2011-07-18 20:49:35 +00:00
Jörg Mayer
7fc2e9b2b5 Add a comment how to actually use the protocol help.
svn path=/trunk/; revision=38097
2011-07-18 20:44:01 +00:00
Jörg Mayer
7e6b1202c9 Update status file to current state and statistics
svn path=/trunk/; revision=38093
2011-07-18 18:24:22 +00:00
Jörg Mayer
f60fdf3dcc Fix some trivial cases of gdk-deprecated warnings. The remaining
ones have to be fixed by someone who understands the code.

svn path=/trunk/; revision=38092
2011-07-18 18:16:36 +00:00
Michael Tüxen
f2cbf9239d Ignore interfaces without a name.
svn path=/trunk/; revision=38091
2011-07-18 17:44:26 +00:00
Michael Tüxen
da0355b1fa Make a check a bit more pedantic.
svn path=/trunk/; revision=38090
2011-07-18 17:15:45 +00:00
Michael Tüxen
a180787959 Make sure that the Capture/Start menue item will always use the
same interfaces as selected in the Main Welcome Window.

svn path=/trunk/; revision=38087
2011-07-18 16:20:19 +00:00
Jörg Mayer
fae6f11845 Small comment update: GtkItemFactory has been deprecated as of gtk 2.4
(aka close to forever).

svn path=/trunk/; revision=38083
2011-07-18 13:19:34 +00:00
Jörg Mayer
277a56089c Update STATUS.gtk3
Make linking with stubbed out proto_help functions really work.
Add a comment to proto_help that its functionality will be lost
  once we make the ui-manager code default unless someone cares
  enough to fix it.
Enable -DGTK_DISABLE_DEPRECATED iff building with ui-manager.

svn path=/trunk/; revision=38079
2011-07-18 12:40:40 +00:00
Jörg Mayer
6d7b0cf5f1 Prevent error about undefined function while linking.
svn path=/trunk/; revision=38078
2011-07-18 12:18:00 +00:00
Michael Tüxen
3e3bc0f7f0 Remove redundant code.
svn path=/trunk/; revision=38063
2011-07-16 17:04:48 +00:00
Michael Tüxen
09fb2cf315 Use correct plausability check.
svn path=/trunk/; revision=38062
2011-07-16 14:19:43 +00:00
Michael Tüxen
09af2bc6d2 Don't allow capturing from multiple interface when compiled with multiple thread
support.

svn path=/trunk/; revision=38057
2011-07-16 11:07:32 +00:00
Michael Tüxen
9adf6c20ca Get rid of two gtk runtime warnings.
svn path=/trunk/; revision=38052
2011-07-15 21:26:43 +00:00
Michael Tüxen
85d399d906 You can't create a mutex without initializing the thread system.
So #ifdef the code with USE_THREADS.

svn path=/trunk/; revision=38045
2011-07-15 14:58:45 +00:00
Michael Tüxen
c481dda78c Fix compilation on non-windows platforms defining USE_THREADS.
svn path=/trunk/; revision=38044
2011-07-15 14:31:27 +00:00
Jörg Mayer
00beddf9fc Add a missing ( in the UI_MANAGER case
svn path=/trunk/; revision=38042
2011-07-15 11:14:41 +00:00
Gerald Combs
a533d70be0 On Windows enable threads everywhere instead of just in dumpcap. If
threads are enabled use them to check the recent file list. Fixes bug
3810.

svn path=/trunk/; revision=38033
2011-07-14 23:18:02 +00:00
Anders Broman
a779bef74d Fix trunk/gtk/menus.c:4427:9: error: ‘sep_entry’ undeclared (first use in this function)
svn path=/trunk/; revision=38031
2011-07-14 22:08:15 +00:00
Jörg Mayer
ef1e70dfd7 Remove trailing whitespace
Replace a deprecated gdk function

svn path=/trunk/; revision=38027
2011-07-14 21:25:33 +00:00
Anders Broman
1785a37ab4 Remove €˜GtkItemFactoryEntry code in MAIN_MENU_USE_UIMANAGER
code path.
Don't build and don't use protocol help if MAIN_MENU_USE_UIMANAGER is defined.

svn path=/trunk/; revision=38024
2011-07-14 20:36:00 +00:00
Bill Meier
43806aff9d Fix a crash when doing Telephony ! RTP ! Stream Analysis with capture files with truncated frames.
(That is: the capture files were created with a snapshot length less than the maximum).

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6120


svn path=/trunk/; revision=38023
2011-07-14 19:51:53 +00:00
Michael Tüxen
e791424ab6 Add back r37749, which was taken out by accident.
Thanks to Stephen Fisher for pointing it out.

svn path=/trunk/; revision=38018
2011-07-14 16:54:44 +00:00
Jörg Mayer
c04911c06a Fix the last non-gtkitemfactory stuff for use with -DGTK_DISABLE_DEPRECATED.
Left are:

gtk/menus.c:4382:5: error: ‘GtkItemFactoryEntry’ undeclared (first use in this function)
gtk/menus.c:4382:26: error: ‘sep_entry’ undeclared (first use in this function)
gtk/proto_help.c:79:16: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘*’ token
gtk/proto_help.c:166:2: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:166:2: error: implicit declaration of function ‘gtk_item_factory_from_widget’
gtk/proto_help.c:181:6: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:183:2: error: implicit declaration of function ‘gtk_item_factory_get_widget’
gtk/proto_help.c:191:2: error: implicit declaration of function ‘gtk_item_factory_get_item’
gtk/proto_help.c:216:2: error: ‘GtkItemFactoryEntry’ undeclared (first use in this function)
gtk/proto_help.c:216:23: error: ‘menu_entry’ undeclared (first use in this function)
gtk/proto_help.c:217:2: error: ISO C90 forbids mixed declarations and code
gtk/proto_help.c:222:6: error: ‘g_ph_menu_factory’ undeclared (first use in this function)
gtk/proto_help.c:258:4: error: implicit declaration of function ‘gtk_item_factory_create_item’


svn path=/trunk/; revision=38015
2011-07-14 09:43:53 +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
Anders Broman
02e71fb443 From Joerg Mayer:
Patch fixes most of the remaining errors when compiling with
GTK_DISABLE_DEPRECATED.

svn path=/trunk/; revision=38012
2011-07-14 08:02:32 +00:00
Jörg Mayer
3f798982de Update status of compile with -DGTK_DISABLE_DEPRECATED
svn path=/trunk/; revision=38007
2011-07-14 00:16:14 +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
Jörg Mayer
0d30fdf68f make compiling with -DGTK_DISABLE_DEPRECATED work
svn path=/trunk/; revision=38005
2011-07-13 22:49:38 +00:00
Jörg Mayer
275f89b5c2 make compiling with -DGTK_DISABLE_DEPRECATED work
svn path=/trunk/; revision=38004
2011-07-13 22:32:05 +00:00
Anders Broman
1494865058 Remove two deprecated functions.
svn path=/trunk/; revision=37997
2011-07-13 14:47:31 +00:00
Anders Broman
cb98a2b2c2 Fix more tooltips fixes.
svn path=/trunk/; revision=37996
2011-07-13 08:48:13 +00:00
Michael Tüxen
865240b6ba Display interface stuff only when interfaces are available.
svn path=/trunk/; revision=37995
2011-07-12 21:33:11 +00:00
Michael Tüxen
a73931eafd This fixes the compile issue reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6111


svn path=/trunk/; revision=37990
2011-07-12 11:06:44 +00:00
Anders Broman
baf0396650 Fix more tooltips.
svn path=/trunk/; revision=37988
2011-07-12 06:54:01 +00:00
Anders Broman
fb16948f96 Fix more tooltips.
svn path=/trunk/; revision=37987
2011-07-12 06:15:24 +00:00
Anders Broman
ef84ed2d32 Fix more tooltips.
svn path=/trunk/; revision=37980
2011-07-11 21:29:47 +00:00
Gerald Combs
49b92440de More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions
in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove
tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and
reassemble_cleanup() since they were only used for older GLib versions
which didn't support GSlices. Assume we always support the "matches"
operator.

svn path=/trunk/; revision=37978
2011-07-11 20:32:19 +00:00
Anders Broman
1f923105f8 Fix more tooltips, mark gtk_tooltips_new with 'E' in checkapi.
svn path=/trunk/; revision=37976
2011-07-11 20:01:28 +00:00
Anders Broman
3a35b7229c Fix a couple of tooltips.
svn path=/trunk/; revision=37975
2011-07-11 19:34:57 +00:00
Gerald Combs
4608a76a51 Remaining GLIB_CHECK_VERSION and GTK_CHECK_VERSION in the gtk directory.
svn path=/trunk/; revision=37973
2011-07-11 19:10:57 +00:00
Anders Broman
347c71d9a8 GTK_CHECK_VERSION cleanup.
svn path=/trunk/; revision=37972
2011-07-11 18:54:49 +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
Gerald Combs
2c469e3714 More GLIB_CHECK_VERSION, GTK_CHECK_VERSION, and related whitespace
cleanup.

svn path=/trunk/; revision=37970
2011-07-11 18:18:35 +00:00
Gerald Combs
f6d7f90c72 Remove a lot of instances of GTK_CHECK_VERSION. Clean up whitespace in a
couple of places.

svn path=/trunk/; revision=37969
2011-07-11 18:08:08 +00:00
Guy Harris
030ec99939 Point to the right place.
svn path=/trunk/; revision=37944
2011-07-09 01:41:09 +00:00
Balint Reczey
a2c55f0c17 Show a hint to read http://wiki.wireshark.org/CaptureSetup/CapturePrivileges
when showing the warning about running Wireshark as root
Thanks to Evan Huus for the suggestion.

svn path=/trunk/; revision=37943
2011-07-09 00:20:13 +00:00
Michael Tüxen
8e93cf895f Use a pixbuf for widgets used for icons.
svn path=/trunk/; revision=37942
2011-07-08 18:29:02 +00:00
Michael Tüxen
0472f42af7 If no interface is specified on the command line, use the default
capture interface if given.

This patch is provided by Irene Ruengeler.


svn path=/trunk/; revision=37939
2011-07-08 13:47:16 +00:00
Michael Tüxen
b2ab9d134a You can't select/deselct interfaces in the capture/interfaces
dialog while you are capturing.
This patch is provided by Irene Ruengeler.

svn path=/trunk/; revision=37938
2011-07-08 13:40:00 +00:00
Michael Tüxen
d56de3d638 Try to make non-libpcap builds compiling.
svn path=/trunk/; revision=37937
2011-07-08 09:26:34 +00:00
Michael Tüxen
15bf360095 Use the interfaces from the last capturing process as a starting point
for the next one.

Obtained from Irene Ruengeler.

svn path=/trunk/; revision=37936
2011-07-08 08:49:06 +00:00
Jaap Keuter
7890ac3667 Avoid 'variable set but no used' error from compiler.
svn path=/trunk/; revision=37935
2011-07-08 07:52:31 +00:00
Michael Tüxen
746ca92b46 The argument of capture_get_if_icon() is used.
svn path=/trunk/; revision=37932
2011-07-07 21:16:03 +00:00
Michael Tüxen
8fac080296 Try to unbreak the Mac OS X 10.5 buildbots.
svn path=/trunk/; revision=37931
2011-07-07 20:20:55 +00:00
Michael Tüxen
3500412973 Bring back interface icons.
Obtained from Irene Ruengeler.

svn path=/trunk/; revision=37929
2011-07-07 13:57:08 +00:00
Michael Tüxen
20ded72bac Use the interface descriptions again.
This patch is from Irene Ruengeler.

svn path=/trunk/; revision=37928
2011-07-07 13:34:40 +00:00
Michael Tüxen
6542687a78 Fix a crash when using hidden interfaces.
svn path=/trunk/; revision=37925
2011-07-06 17:27:42 +00:00
Martin Mathieson
c4dd3e5e5c Add
#if defined(_WIN32) || defined(HAVE_PCAP_CREATE)
around access to interface_options.buffer_size

svn path=/trunk/; revision=37920
2011-07-06 14:56:42 +00:00
Michael Tüxen
8180111144 Use g_object_set() instead of gtk_object_set().
svn path=/trunk/; revision=37917
2011-07-06 11:35:52 +00:00
Michael Tüxen
b682b5ee01 Get it even linking...
svn path=/trunk/; revision=37916
2011-07-06 11:25:57 +00:00
Michael Tüxen
eef7623fb9 Get it compiling when not having libpcap.
svn path=/trunk/; revision=37915
2011-07-06 11:22:38 +00:00