From a62dabe380126a1ee340180369c8654864e54d38 Mon Sep 17 00:00:00 2001
From: Jens Granseuer <jensgr@gmx.net>
Date: Sun, 25 Jan 2009 11:25:09 +0000
Subject: [PATCH] don't define GNOME_DESKTOP_USE_UNSTABLE_API globally

2009-01-25  Jens Granseuer  <jensgr@gmx.net>

	* configure.in: don't define GNOME_DESKTOP_USE_UNSTABLE_API globally

2009-01-25  Jens Granseuer  <jensgr@gmx.net>

	* Makefile.am:
	* gnome-wp-info.h:
	* gnome-wp-item.h: define GNOME_DESKTOP_USE_UNSTABLE_API in Makefile
	instead of individual headers

svn path=/trunk/; revision=9208
---
 ChangeLog                           | 4 ++++
 capplets/appearance/ChangeLog       | 7 +++++++
 capplets/appearance/Makefile.am     | 2 ++
 capplets/appearance/gnome-wp-info.h | 1 -
 capplets/appearance/gnome-wp-item.h | 1 -
 configure.in                        | 2 --
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 64d75855a..6061afa6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-25  Jens Granseuer  <jensgr@gmx.net>
+
+	* configure.in: don't define GNOME_DESKTOP_USE_UNSTABLE_API globally
+
 2009-01-13  Luca Ferretti  <elle.uca@libero.it>
 
 	* configure.in: 
diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog
index 9b60ff006..b29be5aac 100644
--- a/capplets/appearance/ChangeLog
+++ b/capplets/appearance/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-25  Jens Granseuer  <jensgr@gmx.net>
+
+	* Makefile.am:
+	* gnome-wp-info.h:
+	* gnome-wp-item.h: define GNOME_DESKTOP_USE_UNSTABLE_API in Makefile
+	instead of individual headers
+
 2009-01-25  Jens Granseuer  <jensgr@gmx.net>
 
 	Fix newly installed themes appearing twice in the GTK themes list if
diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am
index 6f2d80415..27288ccb9 100644
--- a/capplets/appearance/Makefile.am
+++ b/capplets/appearance/Makefile.am
@@ -37,6 +37,8 @@ gnome_appearance_properties_SOURCES = \
 	caption-cellrenderer.c \
 	caption-cellrenderer.h
 
+gnome_appearance_properties_CFLAGS = -DGNOME_DESKTOP_USE_UNSTABLE_API
+
 gnome_appearance_properties_LDADD = \
 	$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
 	$(top_builddir)/capplets/common/libcommon.la \
diff --git a/capplets/appearance/gnome-wp-info.h b/capplets/appearance/gnome-wp-info.h
index 54105a8f7..ea1051e28 100644
--- a/capplets/appearance/gnome-wp-info.h
+++ b/capplets/appearance/gnome-wp-info.h
@@ -22,7 +22,6 @@
 #define _GNOME_WP_INFO_H_
 
 #include <glib.h>
-#define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-desktop-thumbnail.h>
 
 typedef struct _GnomeWPInfo GnomeWPInfo;
diff --git a/capplets/appearance/gnome-wp-item.h b/capplets/appearance/gnome-wp-item.h
index 756202127..7a62cdb5f 100644
--- a/capplets/appearance/gnome-wp-item.h
+++ b/capplets/appearance/gnome-wp-item.h
@@ -22,7 +22,6 @@
 #include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
-#define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnomeui/gnome-desktop-thumbnail.h>
 #include <libgnomeui/gnome-bg.h>
 
diff --git a/configure.in b/configure.in
index 9ad0986f2..aa8d2dfb7 100644
--- a/configure.in
+++ b/configure.in
@@ -26,8 +26,6 @@ if test "x$GCC" = "xyes"; then
 fi
 changequote([,])dnl
 
-CFLAGS="$CFLAGS -DGNOME_DESKTOP_USE_UNSTABLE_API"
-
 # Internationalization support
 
 IT_PROG_INTLTOOL([0.37.1])