Commit Graph

24 Commits

Author SHA1 Message Date
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 b89a4858bb Add Makefile_common.common to wireshark-tap-register.c dependencies (windows)
Change-Id: I22d60e10554e419acda945732faa192fbc21aee6
Reviewed-on: https://code.wireshark.org/review/9163
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-25 21:45:40 +00:00
Bill Meier b59e28dd24 Regenerate *-tap-register.c when associated Makefile.common is updated
Change-Id: Id9a83aeb285466f409a0e5ee651ef0c9f26ddda8
Reviewed-on: https://code.wireshark.org/review/9055
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-23 13:42:16 +00:00
Bill Meier 5c529c95c5 Add '*.nativecodeanalysis.xml' to 'clean' targets
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6
Reviewed-on: https://code.wireshark.org/review/6220
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-02 01:45:16 +00:00
Роман Донченко dc748b1e7f Now that Python is mandatory on Windows, remove checks for it from nmakefiles
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a
Reviewed-on: https://code.wireshark.org/review/3392
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-09 20:23:39 +00:00
Guy Harris a442d7bd76 Include ZLIB_CFLAGS so we file zlib.h.
Change-Id: I9026f99397b1dfbc550af550d0c71597b3c87950
Reviewed-on: https://code.wireshark.org/review/2592
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-24 00:04:26 +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
Chris Maynard 37a7e3382c Revert the changes made to resolve https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 (When following an HTTP tcp stream decode gzip data automatically), as they caused a bigger problem reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 ("Follow TCP Stream" shows only first HTTP req+res).
#BACKPORT(1.10)


svn path=/trunk/; revision=52506
2013-10-10 19:48:37 +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
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Bill Meier 3026b7c324 Add a rule to create layouts.h (using gdk-pixbuf-csource
in a similar manner as done in Makefile.am)

(On my Windows 7 system gdk-pixbuf-csource gives an error
message about "...Couldn't recognize the image file format...".
Let's see what happens in the Windows buildbots).

svn path=/trunk/; revision=47165
2013-01-19 16:39:28 +00:00
Michael Mann a37f60e4f6 Bug 3528 - When following an HTTP tcp stream decode gzip data automatically (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528)
includes patch from bug (with actual functionality) + changes to makefiles to make it compile/link on Windows

svn path=/trunk/; revision=46530
2012-12-13 19:59:57 +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
Guy Harris bd16652c90 text_import_scanner_lex.h and text_import_scanner.c are now part of
libui, not libgtkui.

svn path=/trunk/; revision=44913
2012-09-15 08:43:27 +00:00
Guy Harris 366489a085 DIRTY_GENERATED_C_FILES is empty, and isn't used by ui/gtk/Makefile.am,
so get rid of it, and stop using it in ui/gtk/Makefile.make; we don't
want to encourage people to create source files that get warnings.

svn path=/trunk/; revision=44910
2012-09-15 08:18:57 +00:00
Bill Meier d0868be051 Add '*.sbr' to 'clean'
svn path=/trunk/; revision=43233
2012-06-13 16:19:35 +00:00
Bill Meier f672e4822a Cosmetic change....
svn path=/trunk/; revision=42440
2012-05-05 16:02:36 +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
Bill Meier 605dea0486 CVARSDLL hasn't been used (is undefined) for a while....
svn path=/trunk/; revision=41180
2012-02-24 16:23:38 +00:00
Guy Harris 979db3f4fb Don't run Flex-generated files through checkapi - they use forbidden
APIs such as malloc and free.

svn path=/trunk/; revision=41079
2012-02-19 23:35:19 +00:00
Guy Harris 7100e7a8a0 We already have GENERATED_HEADER_FILES; use that instead of
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-19 22:41:53 +00:00
Guy Harris bdab9be898 Rename the (static) library built from stuff in ui/gtk to "libgtkui" in
automake/autoconf and nmake builds, to match the name in CMake builds.

svn path=/trunk/; revision=41058
2012-02-18 20:21:30 +00:00
Jörg Mayer ef356ef2ef More .. -> ../.. changes after gtk/ move
svn path=/trunk/; revision=40522
2012-01-15 22:22:28 +00:00
Jörg Mayer be706c6380 Move gtk to ui/gtk.
This looses the last checkin to gtk, will add this manually back.

svn path=/trunk/; revision=40518
2012-01-15 21:59:11 +00:00