callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore gdk-pixbuf deprecations

Browse Source
This commit is contained in:
Matthias Clasen 2014-10-27 07:05:22 -04:00
parent 96a3b23736
commit fc6f22c3ce
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkiconcache.c
View File

@ -510,6 +510,7 @@ _gtk_icon_cache_get_icon (GtkIconCache *cache,
length = GET_UINT32 (cache->buffer, pixel_data_offset + 4); length = GET_UINT32 (cache->buffer, pixel_data_offset + 4);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
if (!gdk_pixdata_deserialize (&pixdata, length, if (!gdk_pixdata_deserialize (&pixdata, length,
(guchar *)(cache->buffer + pixel_data_offset + 8), (guchar *)(cache->buffer + pixel_data_offset + 8),
&error)) &error))
@ -520,6 +521,7 @@ _gtk_icon_cache_get_icon (GtkIconCache *cache,
return NULL; return NULL;
} }
G_GNUC_END_IGNORE_DEPRECATIONS
pixbuf = gdk_pixbuf_new_from_data (pixdata.pixel_data, GDK_COLORSPACE_RGB, pixbuf = gdk_pixbuf_new_from_data (pixdata.pixel_data, GDK_COLORSPACE_RGB,
(pixdata.pixdata_type & GDK_PIXDATA_COLOR_TYPE_MASK) == GDK_PIXDATA_COLOR_TYPE_RGBA, (pixdata.pixdata_type & GDK_PIXDATA_COLOR_TYPE_MASK) == GDK_PIXDATA_COLOR_TYPE_RGBA,

4
gtk/gtktextbufferserialize.c
View File

@ -590,6 +590,7 @@ serialize_text (GtkTextBuffer *buffer,
g_string_append (context->text_str, "</text>\n</text_view_markup>\n"); g_string_append (context->text_str, "</text>\n</text_view_markup>\n");
} }
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
static void static void
serialize_pixbufs (SerializationContext *context, serialize_pixbufs (SerializationContext *context,
GString *text) GString *text)
@ -611,6 +612,7 @@ serialize_pixbufs (SerializationContext *context,
g_free (tmp); g_free (tmp);
} }
} }
G_GNUC_END_IGNORE_DEPRECATIONS
guint8 * guint8 *
_gtk_text_buffer_serialize_rich_text (GtkTextBuffer *register_buffer, _gtk_text_buffer_serialize_rich_text (GtkTextBuffer *register_buffer,
@ -1068,6 +1070,7 @@ typedef struct
const gchar *start; const gchar *start;
} Header; } Header;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
static GdkPixbuf * static GdkPixbuf *
get_pixbuf_from_headers (GList *headers, get_pixbuf_from_headers (GList *headers,
int id, int id,
@ -1090,6 +1093,7 @@ get_pixbuf_from_headers (GList *headers,
return pixbuf; return pixbuf;
} }
G_GNUC_END_IGNORE_DEPRECATIONS
static void static void
parse_apply_tag_element (GMarkupParseContext *context, parse_apply_tag_element (GMarkupParseContext *context,