diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-21 17:10:03 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-02-25 04:50:59 +0000 |
| commit | 394eaa1c20a43d75e59e14bc1d3e968451f880e4 (patch) | |
| tree | 3876a18b6e48febeb9d60170e28a13bedf22e2c7 /ui/gtk/stock_icons.c | |
| parent | 03dfd9cead43930e481fad614ac83e760cee98ea (diff) | |
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>
Diffstat (limited to 'ui/gtk/stock_icons.c')
| -rw-r--r-- | ui/gtk/stock_icons.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/stock_icons.c b/ui/gtk/stock_icons.c index ea4d49b44e..79e77467fa 100644 --- a/ui/gtk/stock_icons.c +++ b/ui/gtk/stock_icons.c @@ -28,7 +28,7 @@ #include <string.h> #include "ui/gtk/stock_icons.h" -#ifndef HAVE_GRESOURCE +#ifndef HAVE_GDK_GRESOURCE #include "ui/gtk/pixbuf-csource.h" #endif #include "ui/gtk/gui_utils.h" @@ -92,7 +92,7 @@ typedef struct stock_pixmap_tag{ typedef struct stock_pixbuf_tag{ const char * name; -#ifdef HAVE_GRESOURCE +#ifdef HAVE_GDK_GRESOURCE struct { const char *p16; /* Optional */ const char *p24; /* Mandatory */ @@ -323,7 +323,7 @@ void stock_icons_init(void) { #endif static const stock_pixbuf_t pixbufs[] = { -#ifdef HAVE_GRESOURCE +#ifdef HAVE_GDK_GRESOURCE { WIRESHARK_STOCK_ABOUT, { "/org/wireshark/image/wsicon16.png", "/org/wireshark/image/wsicon24.png" } @@ -454,7 +454,7 @@ void stock_icons_init(void) { /* Add pixbufs as builtin theme icons */ for (i = 0; pixbufs[i].name != NULL; i++) { -#ifdef HAVE_GRESOURCE +#ifdef HAVE_GDK_GRESOURCE GdkPixbuf * pixbuf24 = ws_gdk_pixbuf_new_from_resource(pixbufs[i].path.p24); #else GdkPixbuf * pixbuf24 = gdk_pixbuf_new_from_inline(-1, pixbufs[i].pb_data24, FALSE, NULL); @@ -468,7 +468,7 @@ void stock_icons_init(void) { /* Default image */ gtk_icon_theme_add_builtin_icon(pixbufs[i].name, 24, pixbuf24); -#ifdef HAVE_GRESOURCE +#ifdef HAVE_GDK_GRESOURCE if (pixbufs[i].path.p16 != NULL) { GdkPixbuf * pixbuf16 = ws_gdk_pixbuf_new_from_resource(pixbufs[i].path.p16); #else |