debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Attempt to fix a build issue with GtkIconEntry

Browse source
This commit is contained in:
Christian Dywan 2008-07-19 04:07:34 +02:00
parent 4f0f228dc4
commit d06daa12f0
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
midori/gtkiconentry.c
View file

@ -18,10 +18,14 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include "gtkiconentry.h"
#include <string.h> #include <string.h>
#ifndef GTK_IMAGE_GICON #if GTK_CHECK_VERSION (2, 14, 0)
#define GTK_IMAGE_GICON 8 #define _GTK_IMAGE_GICON GTK_IMAGE_GICON
#else
#define _GTK_IMAGE_GICON 8
#endif #endif
#ifndef GTK_PARAM_READABLE #ifndef GTK_PARAM_READABLE
@ -38,8 +42,6 @@
#define P_(s) (s) #define P_(s) (s)
#include "gtkiconentry.h"
#define ICON_MARGIN 2 #define ICON_MARGIN 2
#define MAX_ICONS 2 #define MAX_ICONS 2
@ -1103,7 +1105,7 @@ icon_theme_changed (GtkIconEntry *entry)
} }
#if GLIB_CHECK_VERSION (2, 16, 0) #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); g_object_unref (priv->icons[i].pixbuf);
priv->icons[i].pixbuf = NULL; priv->icons[i].pixbuf = NULL;
@ -1506,7 +1508,7 @@ gtk_icon_entry_get_gicon (const GtkIconEntry *entry,
priv = GTK_ICON_ENTRY_GET_PRIVATE (entry); priv = GTK_ICON_ENTRY_GET_PRIVATE (entry);
icon_info = &priv->icons[icon_pos]; 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 #endif