[gimp] plug-ins: #undef G_DISABLE_DEPRECATED for webkit and rsvg



commit 8ed5002e4aba103fb503bf1b4c3819ffe700f8f0
Author: Michael Natterer <mitch gimp org>
Date:   Tue Jun 21 22:13:58 2011 +0200

    plug-ins: #undef G_DISABLE_DEPRECATED for webkit and rsvg
    
    because they use G_CONST_RETURN which is deprecated in glib master.

 plug-ins/common/file-svg.c     |    1 +
 plug-ins/common/web-page.c     |    1 +
 plug-ins/help-browser/dialog.c |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c
index 3af5b06..4acbfbe 100644
--- a/plug-ins/common/file-svg.c
+++ b/plug-ins/common/file-svg.c
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#undef G_DISABLE_DEPRECATED /* for G_CONST_RETURN used by rsvg */
 #include <librsvg/rsvg.h>
 #include <librsvg/librsvg-features.h>  /* for version check */
 
diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c
index ec7a09d..ba147ed 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -23,6 +23,7 @@
 
 #include "config.h"
 
+#undef G_DISABLE_DEPRECATED /* for G_CONST_RETURN used by webkit */
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
diff --git a/plug-ins/help-browser/dialog.c b/plug-ins/help-browser/dialog.c
index 9cdeaea..be3d8b6 100644
--- a/plug-ins/help-browser/dialog.c
+++ b/plug-ins/help-browser/dialog.c
@@ -27,6 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#undef G_DISABLE_DEPRECATED /* for G_CONST_RETURN used by webkit */
 #include <gtk/gtk.h>
 
 #include <gdk/gdkkeysyms.h>



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