[Xfce4-commits] r26470 - in libxfcegui4/trunk: . libxfcegui4

[Nick Schermer]

Author: nick
Date: 2007-12-13 10:35:30 +0000 (Thu, 13 Dec 2007)
New Revision: 26470

Modified:
   libxfcegui4/trunk/ChangeLog
   libxfcegui4/trunk/libxfcegui4/netk-trayicon.h
Log:
	* libxfcegui4/netk-trayicon.h: Deprecated code. Last piece
	  was used in xfce-mcs-plugin, but has been replaced by
	  GtkStatusIcon.

Modified: libxfcegui4/trunk/ChangeLog
===================================================================
--- libxfcegui4/trunk/ChangeLog	2007-12-13 10:25:48 UTC (rev 26469)
+++ libxfcegui4/trunk/ChangeLog	2007-12-13 10:35:30 UTC (rev 26470)
@@ -1,5 +1,11 @@
 2007-12-13  Nick Schermer <nick at xfce.org>
 
+	* libxfcegui4/netk-trayicon.h: Deprecated code. Last piece
+	  was used in xfce-mcs-plugin, but has been replaced by
+	  GtkStatusIcon.
+
+2007-12-13  Nick Schermer <nick at xfce.org>
+
 	* libxfcegui4/xfce_clock.h, libxfcegui4/xfce_systemtray.h:
 	  Deprecate the clock and systray code.
 

Modified: libxfcegui4/trunk/libxfcegui4/netk-trayicon.h
===================================================================
--- libxfcegui4/trunk/libxfcegui4/netk-trayicon.h	2007-12-13 10:25:48 UTC (rev 26469)
+++ libxfcegui4/trunk/libxfcegui4/netk-trayicon.h	2007-12-13 10:35:30 UTC (rev 26470)
@@ -29,6 +29,10 @@
 
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS 
+
+#ifndef XFCE_DISABLE_DEPRECATED
+
 #define NETK_TYPE_TRAY_ICON     (netk_tray_icon_get_type())
 #define NETK_TRAY_ICON(o)       (G_TYPE_CHECK_INSTANCE_CAST((o),        \
                                  NETK_TYPE_TRAY_ICON,                   \
@@ -39,8 +43,6 @@
 #define NETK_IS_TRAY_ICON(o)    (G_TYPE_CHECK_INSTANCE_TYPE((o),        \
                                  NETK_TYPE_TRAY_ICON))
 
-G_BEGIN_DECLS 
-
 typedef struct _NetkTrayIcon NetkTrayIcon;
 typedef struct _NetkTrayIconClass NetkTrayIconClass;
 
@@ -86,5 +88,7 @@
                                          const gchar *text);
 void netk_tray_icon_message_cancel (NetkTrayIcon *trayicon, glong id);
 
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
 G_END_DECLS
 #endif /* !__NETK_TRAY_ICON_H__ */