diff options
| author | Christian Dywan <christian@twotoasts.de> | 2008-07-19 04:22:40 +0200 |
|---|---|---|
| committer | Christian Dywan <christian@twotoasts.de> | 2008-07-19 04:22:40 +0200 |
| commit | 02794fc13ea25b2dda8df80b2e9ef6e5742496fe (patch) | |
| tree | 1f751ee9c6ac04487a1ab74991ec33b11d7f034b /midori/gtkiconentry.c | |
| parent | c14b4c096d846b874d8ffe39c027d30b59dadf59 (diff) | |
| download | midori-02794fc13ea25b2dda8df80b2e9ef6e5742496fe.tar.gz | |
Attempt to fix a build issue with GtkIconEntry
Diffstat (limited to 'midori/gtkiconentry.c')
| -rw-r--r-- | midori/gtkiconentry.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/midori/gtkiconentry.c b/midori/gtkiconentry.c index 0745d5ba..6faa9845 100644 --- a/midori/gtkiconentry.c +++ b/midori/gtkiconentry.c @@ -18,10 +18,14 @@ * Boston, MA 02111-1307, USA. */ +#include "gtkiconentry.h" + #include <string.h> -#ifndef GTK_IMAGE_GICON -#define GTK_IMAGE_GICON 8 +#if GTK_CHECK_VERSION (2, 14, 0) +#define _GTK_IMAGE_GICON GTK_IMAGE_GICON +#else +#define _GTK_IMAGE_GICON 8 #endif #ifndef GTK_PARAM_READABLE @@ -38,8 +42,6 @@ #define P_(s) (s) -#include "gtkiconentry.h" - #define ICON_MARGIN 2 #define MAX_ICONS 2 @@ -1103,7 +1105,7 @@ icon_theme_changed (GtkIconEntry *entry) } #if GLIB_CHECK_VERSION (2, 16, 0) - else if (priv->icons[i].storage_type == GTK_IMAGE_GICON) + else if (priv->icons[i].storage_type == _GTK_IMAGE_GICON) { g_object_unref (priv->icons[i].pixbuf); priv->icons[i].pixbuf = NULL; @@ -1506,7 +1508,7 @@ gtk_icon_entry_get_gicon (const GtkIconEntry *entry, priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); icon_info = &priv->icons[icon_pos]; - return icon_info->storage_type == GTK_IMAGE_GICON ? icon_info->gicon : NULL; + return icon_info->storage_type == _GTK_IMAGE_GICON ? icon_info->gicon : NULL; } #endif |