[gtk+] Ignore gdk-pixbuf deprecations



commit fc6f22c3ce0e628d955e23c131d0b16b2939b2eb
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Oct 27 07:05:22 2014 -0400

    Ignore gdk-pixbuf deprecations

 gtk/gtkiconcache.c           |    2 ++
 gtk/gtktextbufferserialize.c |    4 ++++
 2 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index 091091e..ac60352 100644
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -510,6 +510,7 @@ _gtk_icon_cache_get_icon (GtkIconCache *cache,
 
   length = GET_UINT32 (cache->buffer, pixel_data_offset + 4);
   
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   if (!gdk_pixdata_deserialize (&pixdata, length, 
                                (guchar *)(cache->buffer + pixel_data_offset + 8),
                                &error))
@@ -520,6 +521,7 @@ _gtk_icon_cache_get_icon (GtkIconCache *cache,
 
       return NULL;
     }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
   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,
diff --git a/gtk/gtktextbufferserialize.c b/gtk/gtktextbufferserialize.c
index e065f10..acb982f 100644
--- a/gtk/gtktextbufferserialize.c
+++ b/gtk/gtktextbufferserialize.c
@@ -590,6 +590,7 @@ serialize_text (GtkTextBuffer        *buffer,
   g_string_append (context->text_str, "</text>\n</text_view_markup>\n");
 }
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static void
 serialize_pixbufs (SerializationContext *context,
                   GString              *text)
@@ -611,6 +612,7 @@ serialize_pixbufs (SerializationContext *context,
       g_free (tmp);
     }
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 guint8 *
 _gtk_text_buffer_serialize_rich_text (GtkTextBuffer     *register_buffer,
@@ -1068,6 +1070,7 @@ typedef struct
   const gchar *start;
 } Header;
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 static GdkPixbuf *
 get_pixbuf_from_headers (GList   *headers,
                          int      id,
@@ -1090,6 +1093,7 @@ get_pixbuf_from_headers (GList   *headers,
 
   return pixbuf;
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 static void
 parse_apply_tag_element (GMarkupParseContext  *context,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]