[tomboy] Redefine deprecated macros if using gtk+ >= 2.19.7

[Sanford Armstrong <sharm src gnome org>]

commit 96b1742d6a61aaff1b66667740e5a9a64ebd2a8c
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Mon Mar 15 11:17:19 2010 -0700

    Redefine deprecated macros if using gtk+ >= 2.19.7

 configure.in           |    5 +++++
 libtomboy/Makefile.am  |    7 ++++++-
 libtomboy/tomboyutil.h |    5 +++++
 3 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/configure.in b/configure.in
index 6e17b03..aaa04fc 100644
--- a/configure.in
+++ b/configure.in
@@ -65,6 +65,11 @@ if pkg-config --atleast-version=2.16 gtk+-2.0; then
 fi
 AM_CONDITIONAL(HAS_GTK_2_16, test "x$HAS_GTK_2_16" = "xyes")
 
+if pkg-config --atleast-version=2.19.7 gtk+-2.0; then
+	HAS_GTK_2_20=yes
+fi
+AM_CONDITIONAL(HAS_GTK_2_20, test "x$HAS_GTK_2_20" = "xyes")
+
 #
 # Use pkg-config to check for the panel applet server directory if
 # specified by --enable-panelapplet-srvdir-check.
diff --git a/libtomboy/Makefile.am b/libtomboy/Makefile.am
index 7fc6743..8074923 100644
--- a/libtomboy/Makefile.am
+++ b/libtomboy/Makefile.am
@@ -1,4 +1,8 @@
 
+if HAS_GTK_2_20
+EXTRA_FLAGS = -DHAS_GTK_2_20
+endif
+
 INCLUDES = 				\
 	-I$(top_srcdir)			\
 	-DG_LOG_DOMAIN=\"libtomboy\"	\
@@ -6,7 +10,8 @@ INCLUDES = 				\
 	-DGTK_DISABLE_DEPRECATED 	\
 	-DGDK_DISABLE_DEPRECATED 	\
 	-DG_DISABLE_DEPRECATED		\
-	$(LIBTOMBOY_CFLAGS)
+	$(LIBTOMBOY_CFLAGS)		\
+	$(EXTRA_FLAGS)
 
 tomboylibdir = $(pkglibdir)
 tomboylib_LTLIBRARIES = libtomboy.la
diff --git a/libtomboy/tomboyutil.h b/libtomboy/tomboyutil.h
index 0527272..c691331 100644
--- a/libtomboy/tomboyutil.h
+++ b/libtomboy/tomboyutil.h
@@ -28,6 +28,11 @@
 
 G_BEGIN_DECLS
 
+#ifdef HAS_GTK_2_20
+#define GTK_WIDGET_REALIZED(wid)	  (gtk_widget_get_realized (wid))
+#define GTK_WIDGET_VISIBLE(wid)	  (gtk_widget_get_visible (wid))
+#endif
+
 gint tomboy_window_get_workspace (GtkWindow *window);
 
 void tomboy_window_move_to_current_workspace (GtkWindow *window);