Commit Graph

60 Commits

Author SHA1 Message Date
Dario Lombardo e80b40adbe extcap: remove conditional compilation.
Change-Id: Ia54bba388755cf27a343fe6d69d244bf1ab897f9
Reviewed-on: https://code.wireshark.org/review/25186
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-08 05:50:15 +00:00
Gerald Combs 0f3aa8522e Qt: Move sized toolbar images to stock_icons.
The sized (WWxHH) icons in the toolbar directory aren't limited to
toolbars. Create a "stock_icons" directory and move them and their
related SVGs there.

Change-Id: I2c1852499594aa738371c79542f24bd3351653bb
Reviewed-on: https://code.wireshark.org/review/25133
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-01-05 03:27:15 +00:00
João Valverde 7617af1d89 Fix make distcheck
Change-Id: I0c5a31d423d19071dc6ed0a42b064271e5f63fd2
Reviewed-on: https://code.wireshark.org/review/24769
Reviewed-by: João Valverde <j@v6e.pt>
2017-12-11 20:21:09 +00:00
João Valverde 5fc43fe63a Rewrite make-tap-reg.py in C
Change-Id: Ief5b1fffecc9712c01ff10292c403b7c84a5908a
Reviewed-on: https://code.wireshark.org/review/24756
Reviewed-by: João Valverde <j@v6e.pt>
2017-12-11 02:52:28 +00:00
João Valverde 1097e8020a autotools: Library build products don't need explicit cleaning
Change-Id: I5d68c05f2844d6c9ae486531b189dbf10bc09cff
Reviewed-on: https://code.wireshark.org/review/24484
Reviewed-by: João Valverde <j@v6e.pt>
2017-11-18 22:29:41 +00:00
João Valverde 9764cd0a83 autotools: make maintainer-clean should allow rerunning 'configure'
Change-Id: Iedae94ffefe27b13b1967d69cacb757b5aa4576d
Reviewed-on: https://code.wireshark.org/review/23928
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2017-10-15 14:17:20 +00:00
Michael Mann b5759cafae Integrate LBM UIM Flow dialog into "regular" Flow diagram.
Reduce all of the code duplication and just register the sequence
analysis functionality in LBM dissector.

Change-Id: I6cb5a7f0a92b04357334bbae301fa2d730a21994
Reviewed-on: https://code.wireshark.org/review/23630
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-09-20 04:48:40 +00:00
Michael Mann 09efa5fb8b Remove proto_help.[ch]
The functionality hasn't been used for awhile and was deprecated with GTK 2.4 (while our minimum support is at least 2.14).  It's also causing unnecessary checkAPI warnings.

Change-Id: Ib8da8300a50e2129a46ad188b4ed4d7b2d44b1ca
Reviewed-on: https://code.wireshark.org/review/16813
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-01 04:19:56 +00:00
João Valverde a16d401b25 Remove Makefile.common files
Now that nmake build system has been removed they are not needed anymore.

Change-Id: I88075f955bb4349185859c1af4be22e53de5850f
Reviewed-on: https://code.wireshark.org/review/16050
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-06-30 11:04:17 +00:00
Pascal Quantin 6baa1b544c Remove Nmake build system
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-15 19:21:57 +00:00
AndersBroman 46d11dad09 Fix a typo causing pixbuf-csource.c not to be built if GDK_GRERESOURCE
does not exist.

Change-Id: Ic6bc15d282f016965ef0da4e7574ef3a6080a6f8
Reviewed-on: https://code.wireshark.org/review/15013
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-04-20 10:31:45 +00:00
João Valverde 52dd4fb633 Fix building without extcap enabled
Using cmake -DENABLE_EXTCAP=no or ./configure --without-extcap.

Some documentation fixes too.

Change-Id: Iebf9c843d67e10a32de1a62904de8f88b872ec99
Reviewed-on: https://code.wireshark.org/review/14522
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-21 17:10:21 +00:00
João Valverde 8b8253b8ad GTK: Revert most of g11b058e
Don't distribute gresource, it's redundant binary data, make the distribution
more similar to Qt instead.

We may want to check that glib-compile-resources is in the PATH during
configure.

Change-Id: I82c57f8169be0cbcac14d4ca79df8dece6c4d7ff
Reviewed-on: https://code.wireshark.org/review/14455
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-15 05:06:57 +00:00
João Valverde 5f8003e949 Add EditorConfig settings for most C files
Change-Id: I02e6d71290bbdf7504437b0d670955b3686b6b52
Reviewed-on: https://code.wireshark.org/review/14360
Reviewed-by: João Valverde <j@v6e.pt>
2016-03-08 10:46:35 +00:00
João Valverde 11b058e35f GTK: make dist fixups
Change-Id: I6e83335cd3c6c77a77f5d77c2e1edc36afd0fbed
Reviewed-on: https://code.wireshark.org/review/14153
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-27 12:21:34 +00:00
João Valverde 394eaa1c20 Add GResource message to configure script
Use more descriptive naming while at it.

Change-Id: Ic89562cb9fa2cd5e315992f12ad9e46f2361da0b
Reviewed-on: https://code.wireshark.org/review/14057
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-25 04:50:59 +00:00
João Valverde f0fb79d534 autotools: Use pkg-config autoconf macros for GLib/GTK
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset
of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add
dependency flags explicitly instead of using WS_CPPFLAGS.

Some minor improvements and fixes for missing/unnecessary variables (no impact
on our test builds).

Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671
Reviewed-on: https://code.wireshark.org/review/14005
Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21 07:51:55 +00:00
Guy Harris b32a5ee98c Don't add the wiretap directory to the list of include directories.
If you include something from the wiretap directory, always precede it
with wiretap/.

Fix some includes of files in the top-level directory to use a path
relative to the current directory, not relative to the wiretap
directory.

This makes it a bit clearer what's being included.

Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54
Reviewed-on: https://code.wireshark.org/review/13990
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-18 12:55:26 +00:00
João Valverde 265a41e14d autotools: Don't use "user variables" to set build flags
GNU coding standards recommend against it and automake is designed
around it.

This allows overriding the global build flags using AM_CFLAGS, etc.,
or per object flags, something that is difficult or impossible currently
because of automake precedence rules.

Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12
Reviewed-on: https://code.wireshark.org/review/13455
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: João Valverde <j@v6e.pt>
2016-01-28 18:13:48 +00:00
João Valverde 7c8314a683 Fix ISO C forbids an empty translation unit [-Wpedantic] (airpcap)
Autotools only warning.

Change-Id: I30f33d2f8611d662dbc62326862707bf05ad3f60
Reviewed-on: https://code.wireshark.org/review/12150
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-11-27 22:22:06 +00:00
Stig Bjørlykke 25fd5b5ca6 gtk: Fixed out-of-source autotools build.
Change-Id: Ic9b93aee15b015d51d666a1c6f4f358f689e8843
Ping-Bug: 10750
Reviewed-on: https://code.wireshark.org/review/11842
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-11-15 19:33:13 +00:00
João Valverde 2d7b0fc7d0 [GTK] Replace deprecated gdk_pixbuf_new_from_inline()
Use GResource instead, if available. Add autotools and cmake compile time
checks for build requirements (GIO >= 2.32 and GDK-Pixbuf >= 2.26).

Merge all the various static pixbuf csource header files into
a single pixbuf-csource.h header with external linkage through use of the
tools/make-pixbuf-csource.pl script.

Fix inline pixbuf build target for some image paths (broken for GTK
in gb4a4de7).

Add missing 'expert_ok.png' file to distribution (GTK only).

Minor improvements to style/structure of ui/gtk/Makefile.am.

Bug: 10750
Change-Id: I031296b666ee8b92730400dfa6f71f9ee4304863
Reviewed-on: https://code.wireshark.org/review/10992
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-11-12 07:14:32 +00:00
Bill Meier e31aef065a Regenerate *-tap-register.c when associated Makefile.common is updated (*nix)
Change-Id: I638e4362bbc24e5a0a990dc7339e285e2ac55839
Reviewed-on: https://code.wireshark.org/review/9158
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-25 21:36:45 +00:00
Balint Reczey f1a6ba1aa2 gtk: Don't handle deprecation warnings as errors
This fixes compilation with latest gdk-pixbuf. I plan rewriting
the code to drop deprecaated function usage in a different commit
and reverting this one.

Ping-Bug: 10750
Change-Id: I400e34e625b147a4858e73240602d75910c6eece
Reviewed-on: https://code.wireshark.org/review/8720
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-01 18:50:50 +00:00
Gerald Combs 8576e1c103 Qt: Add stock icons.
The new icons are patterned after the existing capture icons. They could
probably benefit from some adjustments here and there.

Start moving toward icon names and a directory layout compliant with
freedesktop.org's Icon Naming Specification and Icon Theme
Specification. We aren't fully compliant and might never be but anyone
with exposure to FDO icon themes should at least know where everything
is.

Make Capture Start (x-capture-start) the first icon in the toolbar.

Define the Colorize Packets, Auto Scroll, and zoom icons even though the
Qt UI doesn't use them yet.

Leave the Capture Filter, Display Filter, Coloring Rules, Preferences,
and Help icons off for now. The GTK+ toolbar is overly cluttered and I'm
not sure they're necessary.

Try not to break ui/gtk/toolbar_icons.h.

Remove welcome.qrc. I initially added it in case we needed to overlay
the welcome screen with translucent .pngs but that never happened.

To do:

- Move the old GTK+ icons to their own directory.

- Find a better name for the "toolbar" directory. "stock"?

- Make the toolbar configurable.

Change-Id: Ie07592113d307b8db786aedace672312a870fe38
Reviewed-on: https://code.wireshark.org/review/4182
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-20 19:54:04 +00:00
Роман Донченко 95cd6b76bd Remove make-tapreg-dotc and its uses, since Python is now mandatory
Change-Id: I13fd57a288be68d18819826bf566ed7b5688ebaa
Reviewed-on: https://code.wireshark.org/review/3926
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-31 22:14:15 +00:00
Stig Bjørlykke bd38b3152d Support out-of-source checkapi
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir)
from Makefile.am to allow out-of-source 'make checkapi'.

Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973
Reviewed-on: https://code.wireshark.org/review/1294
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-25 04:23:46 +00:00
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Michael Mann d8265cd8c6 Remove Visual Studio solution and project files (and their existence from Makefiles)
There have been discussions on -dev about removing this and I believe I was the last holdout. Finally convinced that I should just have a local copy (ignored by git)

Change-Id: Ic72a22baf58e3412023cf851f0fce16eb07113b0
Reviewed-on: https://code.wireshark.org/review/681
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16 18:03:41 +00:00
Gerald Combs 32352fb1a2 Update the capture start, stop, and restart icons and development badge
with enhanced versions from Elliott.

Switch the interface configuration icon to the "gear" version. This
matches the gear in the capture icon.

svn path=/trunk/; revision=49059
2013-04-26 21:10:35 +00:00
Gerald Combs fc19abb965 Change the "stop capture" icon to a Great Big Huge Square to try to make
it more obvious (particularly at 16x16 pixels) that it and the "start
capture" icons work like media controls.

Update compress-pngs to match the latest version of pngcrush and
recompress our PNGs. Add a "clean-pixmaps" target to ui/gtk/Makefile.am
to make it easier to rebuild our pixbuf includes.

svn path=/trunk/; revision=48776
2013-04-07 17:40:28 +00:00
Gerald Combs 194a145c8f Add the new splash image. Designed by Elliott Aldrich. Switch the splash
image from XPM to PNG+pixbuf. Remove old XPMs.

svn path=/trunk/; revision=48600
2013-03-27 21:29:44 +00:00
Gerald Combs d3b54956c1 Add an interface list icon. Some of the new capture icons were 1 pixel
too small, so add corrected ones. Add SVG versions of the new toolbar
icons. Use consistent naming for alternate icons. Remove some
no-longer-used XPMs. Add a script to compress PNGs using various
utilities and run it. Regenerate the pixbuf includes using the smaller
PNGs.

svn path=/trunk/; revision=48591
2013-03-27 18:09:00 +00:00
Gerald Combs d38a9f54c7 Add new capture toolbar icons.
svn path=/trunk/; revision=48571
2013-03-26 21:35:42 +00:00
Gerald Combs d1b87423df More icon updates.
Use the PNG versions of the new application icons.

Remove the XPM versions of the Wireshark application and capture icons.
To paraphrase Zoidberg, XPMs are bad and we should feel bad. Remove
xpm_to_widget_from_parent (which we weren't using and likely won't use
in the future).

Replace wiki_24.xpm (which was a GNOME or GTK+ stock icon IIRC) with the
16x16 and 24x24 versions emblem-web.png from GNOME icon theme 2.30.3.
This version was used specifically because it's GPLv2 and later versions
are GPLv3.

Update image/README.

svn path=/trunk/; revision=48565
2013-03-26 19:51:33 +00:00
Jaap Keuter 179016c9cb There is no wireless layout.
svn path=/trunk/; revision=47161
2013-01-19 13:01:00 +00:00
Gerald Combs 3d280a8c95 Replace more XPMs with PNGs.
svn path=/trunk/; revision=47159
2013-01-19 05:48:43 +00:00
Gerald Combs 07898cae39 Create 16x16 and 24x24 versions of the document icon with a contrasting
border. Add them as pixbufs to ui/gtk/toolbar_icons.h and use them to
replace the file icon XPM in stock_icons.c. Add modelines.

svn path=/trunk/; revision=46413
2012-12-05 22:28:12 +00:00
Jeff Morriss 623720dc92 Add python cache and temporary files to the list of files to clean up.
svn path=/trunk/; revision=44974
2012-09-18 17:40:50 +00:00
Jeff Morriss a97731bbcb If we have PYTHON use make-tap-reg.py (like we do on Windows): it's slightly
faster than the old shell-script version (~150 msec instead of ~500 msec on
my system).

svn path=/trunk/; revision=44971
2012-09-18 14:48:28 +00:00
Gerald Combs f6c7b3e533 libgtkui_dirty → libui_dirty.
svn path=/trunk/; revision=44907
2012-09-14 21:06:26 +00:00
Gerald Combs fe6816d7fd More fixes for the text import move.
svn path=/trunk/; revision=44906
2012-09-14 20:55:11 +00:00
Jeff Morriss 005bc98d09 LIBGCRYPT_CFLAGS and LIBGNUTLS_CFLAGS don't seem to be necessary here.
svn path=/trunk/; revision=44759
2012-09-03 19:56:25 +00:00
Irene Rüngeler 9fb3d27bee Add green bullet to indicate success.
svn path=/trunk/; revision=44378
2012-08-09 13:23:47 +00:00
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Jeff Morriss 75c3c92f19 Add a "-build" argument to checkAPIs.pl. Use that argument when building
from makefiles (and thus from the buildbot).

The intention is to be able to tell when a human is running the tool so we
can provide more code-review guidance.

As a starter, enable the "too many proto_tree_add_text() calls" check when
a human is running the tool.

svn path=/trunk/; revision=41943
2012-04-04 20:46:49 +00:00
Guy Harris a04472a839 Sort the EXTRA_DIST list.
svn path=/trunk/; revision=41659
2012-03-19 06:31:13 +00:00
Guy Harris 281f48f7e1 And fix some other ../../image/...s for out-of-tree builds.
svn path=/trunk/; revision=41426
2012-03-08 08:46:52 +00:00
Guy Harris 3c04c817d7 Fix to handle out-of-tree builds - use $(top_srcdir) rather than a
string of ../ items to get to another directory in the source tree, as,
when doing an out-of-tree build, the source tree is a separate tree from
the build tree.

svn path=/trunk/; revision=41425
2012-03-08 08:45:20 +00:00
Gerald Combs d839a834cb Update and add icons for capture comments / annotations.
svn path=/trunk/; revision=41406
2012-03-07 20:56:01 +00:00