[libnotify] notification.h: Add deprecation guards

[Javier JardÃn <jjardon src gnome org>]

commit 2fe1748295c97cd8251e1711e0f54c4d65633d48
Author: Javier JardÃn <jjardon gnome org>
Date:   Sun Oct 9 13:08:53 2011 -0400

    notification.h: Add deprecation guards

 docs/reference/Makefile.am |    2 +-
 libnotify/notification.h   |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 509dea4..2ae617f 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -25,7 +25,7 @@ SCANGOBJ_OPTIONS=
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=
+SCAN_OPTIONS=--deprecated-guards="LIBNOTIFY_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
diff --git a/libnotify/notification.h b/libnotify/notification.h
index 1f29f2e..b232b3b 100644
--- a/libnotify/notification.h
+++ b/libnotify/notification.h
@@ -132,11 +132,13 @@ void                notify_notification_set_category          (NotifyNotificatio
 void                notify_notification_set_urgency           (NotifyNotification *notification,
                                                                NotifyUrgency       urgency);
 
-void                notify_notification_set_icon_from_pixbuf  (NotifyNotification *notification,
-                                                               GdkPixbuf          *icon);
 void                notify_notification_set_image_from_pixbuf (NotifyNotification *notification,
                                                                GdkPixbuf          *pixbuf);
 
+#ifndef LIBNOTIFY_DISABLE_DEPRECATED
+void                notify_notification_set_icon_from_pixbuf  (NotifyNotification *notification,
+                                                               GdkPixbuf          *icon);
+
 void                notify_notification_set_hint_int32        (NotifyNotification *notification,
                                                                const char         *key,
                                                                gint                value);
@@ -160,6 +162,7 @@ void                notify_notification_set_hint_byte_array   (NotifyNotificatio
                                                                const char         *key,
                                                                const guchar       *value,
                                                                gsize               len);
+#endif
 
 void                notify_notification_set_hint              (NotifyNotification *notification,
                                                                const char         *key,