aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2016-08-01Remove proto_help.[ch]Michael Mann1-2/+0
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-06-30Remove Makefile.common filesJoão Valverde1-3/+338
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-15Remove Nmake build systemPascal Quantin1-1/+0
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-04-20Fix a typo causing pixbuf-csource.c not to be built if GDK_GRERESOURCEAndersBroman1-1/+1
does not exist. Change-Id: Ic6bc15d282f016965ef0da4e7574ef3a6080a6f8 Reviewed-on: https://code.wireshark.org/review/15013 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-21Fix building without extcap enabledJoão Valverde1-0/+5
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-15GTK: Revert most of g11b058eJoão Valverde1-24/+14
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-08Add EditorConfig settings for most C filesJoão Valverde1-0/+1
Change-Id: I02e6d71290bbdf7504437b0d670955b3686b6b52 Reviewed-on: https://code.wireshark.org/review/14360 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-27GTK: make dist fixupsJoão Valverde1-15/+30
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-25Add GResource message to configure scriptJoão Valverde1-2/+2
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-21autotools: Use pkg-config autoconf macros for GLib/GTKJoão Valverde1-1/+2
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-18Don't add the wiretap directory to the list of include directories.Guy Harris1-1/+1
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-01-28autotools: Don't use "user variables" to set build flagsJoão Valverde1-12/+5
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>
2015-11-27Fix ISO C forbids an empty translation unit [-Wpedantic] (airpcap)João Valverde1-2/+5
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-15gtk: Fixed out-of-source autotools build.Stig Bjørlykke1-1/+1
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-12[GTK] Replace deprecated gdk_pixbuf_new_from_inline()João Valverde1-120/+57
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-06-25Regenerate *-tap-register.c when associated Makefile.common is updated (*nix)Bill Meier1-3/+3
Change-Id: I638e4362bbc24e5a0a990dc7339e285e2ac55839 Reviewed-on: https://code.wireshark.org/review/9158 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-01gtk: Don't handle deprecation warnings as errorsBalint Reczey1-1/+1
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>
2014-09-20Qt: Add stock icons.Gerald Combs1-6/+8
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-08-31Remove make-tapreg-dotc and its uses, since Python is now mandatoryРоман Донченко1-8/+3
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-04-25Support out-of-source checkapiStig Bjørlykke1-2/+4
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-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(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-16Remove Visual Studio solution and project files (and their existence from ↵Michael Mann1-1/+0
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>
2013-04-26Update the capture start, stop, and restart icons and development badgeGerald Combs1-1/+1
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-07Change the "stop capture" icon to a Great Big Huge Square to try to makeGerald Combs1-0/+4
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-03-27Add the new splash image. Designed by Elliott Aldrich. Switch the splashGerald Combs1-0/+5
image from XPM to PNG+pixbuf. Remove old XPMs. svn path=/trunk/; revision=48600
2013-03-27Add an interface list icon. Some of the new capture icons were 1 pixelGerald Combs1-2/+11
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-26Add new capture toolbar icons.Gerald Combs1-2/+2
svn path=/trunk/; revision=48571
2013-03-26More icon updates. Gerald Combs1-4/+18
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-01-19There is no wireless layout.Jaap Keuter1-1/+1
svn path=/trunk/; revision=47161
2013-01-19Replace more XPMs with PNGs.Gerald Combs1-0/+7
svn path=/trunk/; revision=47159
2012-12-05Create 16x16 and 24x24 versions of the document icon with a contrastingGerald Combs1-0/+10
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-09-18Add python cache and temporary files to the list of files to clean up.Jeff Morriss1-1/+3
svn path=/trunk/; revision=44974
2012-09-18If we have PYTHON use make-tap-reg.py (like we do on Windows): it's slightlyJeff Morriss1-3/+8
faster than the old shell-script version (~150 msec instead of ~500 msec on my system). svn path=/trunk/; revision=44971
2012-09-14libgtkui_dirty → libui_dirty.Gerald Combs1-7/+1
svn path=/trunk/; revision=44907
2012-09-14More fixes for the text import move.Gerald Combs1-4/+0
svn path=/trunk/; revision=44906
2012-09-03LIBGCRYPT_CFLAGS and LIBGNUTLS_CFLAGS don't seem to be necessary here.Jeff Morriss1-1/+1
svn path=/trunk/; revision=44759
2012-08-09Add green bullet to indicate success. Irene Rüngeler1-1/+1
svn path=/trunk/; revision=44378
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-04-04Add a "-build" argument to checkAPIs.pl. Use that argument when buildingJeff Morriss1-2/+2
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-03-19Sort the EXTRA_DIST list.Guy Harris1-1/+1
svn path=/trunk/; revision=41659
2012-03-08And fix some other ../../image/...s for out-of-tree builds.Guy Harris1-4/+4
svn path=/trunk/; revision=41426
2012-03-08Fix to handle out-of-tree builds - use $(top_srcdir) rather than aGuy Harris1-1/+1
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-07Update and add icons for capture comments / annotations.Gerald Combs1-0/+7
svn path=/trunk/; revision=41406
2012-02-20Fix tpo.Guy Harris1-1/+1
svn path=/trunk/; revision=41080
2012-02-19Don't run Flex-generated files through checkapi - they use forbiddenGuy Harris1-6/+8
APIs such as malloc and free. svn path=/trunk/; revision=41079
2012-02-19We already have GENERATED_HEADER_FILES; use that instead ofGuy Harris1-5/+4
GENERATED_H_FILES. If we have DIRTY_GENERATED_C_FILES, use it the same way we use GENERATED_C_FILES. GENERATED_FILES is "everything to nuke on a "make maintainer-clean"", not "everything to put into the distribution". svn path=/trunk/; revision=41075
2012-02-19Put back the comment for the rule to generate wireshark-tap-register.c.Guy Harris1-0/+14
svn path=/trunk/; revision=41069
2012-02-18Rename the (static) library built from stuff in ui/gtk to "libgtkui" inGuy Harris1-9/+9
automake/autoconf and nmake builds, to match the name in CMake builds. svn path=/trunk/; revision=41058
2012-01-21Get make checkapi working again.Michael Tüxen1-2/+2
svn path=/trunk/; revision=40625
2012-01-19Add icons for pipe interfaces. This allows for easierMichael Tüxen1-0/+5
testing the upcoming patch, which improves the infrastructure to handle interfaces for capturing. Obtained from Irene Ruengeler. svn path=/trunk/; revision=40583
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 04:51:08 +0000