diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-10-17 13:47:17 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-12 07:14:32 +0000 |
| commit | 2d7b0fc7d046154a393c9a1e5f4b2e9b5fee3738 (patch) | |
| tree | 8b14d373b97ea9162a46e8b61f42919f2a6c5514 /.gitignore | |
| parent | 1ab019f409f2855d3b51717a237cc482242887e9 (diff) | |
| download | wireshark-2d7b0fc7d046154a393c9a1e5f4b2e9b5fee3738.tar.gz wireshark-2d7b0fc7d046154a393c9a1e5f4b2e9b5fee3738.tar.bz2 wireshark-2d7b0fc7d046154a393c9a1e5f4b2e9b5fee3738.zip | |
[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>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d819098e9c..0004e49e55 100644 --- a/.gitignore +++ b/.gitignore @@ -59,6 +59,8 @@ wiretap/ascend.h wiretap/k12text.c wireshark-tap-register.c wireshark-tap-register-cache.pkl +ui/gtk/wireshark-gresources.c +ui/gtk/wireshark-gresources.h # Generated makefile system # ############################# |