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

[Nick Schermer]

Author: nick
Date: 2007-12-13 09:51:18 +0000 (Thu, 13 Dec 2007)
New Revision: 26465

Modified:
   libxfcegui4/trunk/ChangeLog
   libxfcegui4/trunk/libxfcegui4/xfce_clock.h
   libxfcegui4/trunk/libxfcegui4/xfce_systemtray.h
Log:
	* libxfcegui4/xfce_clock.h, libxfcegui4/xfce_systemtray.h:
	  Deprecate the clock and systray code.

Modified: libxfcegui4/trunk/ChangeLog
===================================================================
--- libxfcegui4/trunk/ChangeLog	2007-12-13 09:36:51 UTC (rev 26464)
+++ libxfcegui4/trunk/ChangeLog	2007-12-13 09:51:18 UTC (rev 26465)
@@ -1,3 +1,8 @@
+2007-12-13  Nick Schermer <nick at xfce.org>
+
+	* libxfcegui4/xfce_clock.h, libxfcegui4/xfce_systemtray.h:
+	  Deprecate the clock and systray code.
+
 2007-05-05  Brian Tarricone <bjt23 at cornell.edu>
 
         * configure.in.in: Bump version to 4.5.0, otherwise 4.4.1

Modified: libxfcegui4/trunk/libxfcegui4/xfce_clock.h
===================================================================
--- libxfcegui4/trunk/libxfcegui4/xfce_clock.h	2007-12-13 09:36:51 UTC (rev 26464)
+++ libxfcegui4/trunk/libxfcegui4/xfce_clock.h	2007-12-13 09:51:18 UTC (rev 26465)
@@ -28,6 +28,8 @@
 
 G_BEGIN_DECLS
 
+#ifndef XFCE_DISABLE_DEPRECATED
+
 #define XFCE_TYPE_CLOCK (xfce_clock_get_type ())
 #define XFCE_CLOCK(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, xfce_clock_get_type (), XfceClock)
 #define XFCE_CLOCK_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, xfce_clock_get_type (), XfceClockClass)
@@ -43,7 +45,7 @@
 	XFCE_CLOCK_ANALOG,
 	XFCE_CLOCK_DIGITAL,
 	XFCE_CLOCK_LEDS
-    } 
+    }
     XfceClockMode;
 
     /* this formatting is needed by glib-mkenums */
@@ -52,7 +54,7 @@
 	DIGIT_MEDIUM,
 	DIGIT_LARGE,
 	DIGIT_HUGE
-    } 
+    }
     XfceClockLedSize;
 
     struct _XfceClock
@@ -118,6 +120,8 @@
     gboolean xfce_clock_get_formatted_view (XfceClock * clock);
     XfceClockMode xfce_clock_get_mode (XfceClock * clock);
 
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif				/* __XFCE_CLOCK_H__ */

Modified: libxfcegui4/trunk/libxfcegui4/xfce_systemtray.h
===================================================================
--- libxfcegui4/trunk/libxfcegui4/xfce_systemtray.h	2007-12-13 09:36:51 UTC (rev 26464)
+++ libxfcegui4/trunk/libxfcegui4/xfce_systemtray.h	2007-12-13 09:51:18 UTC (rev 26465)
@@ -37,6 +37,9 @@
 #include <X11/Xmd.h>
 
 G_BEGIN_DECLS
+
+#ifndef XFCE_DISABLE_DEPRECATED
+
 /*
  * Tray icons can send "opcodes" to the system tray. These are X client
  * messages, sent with NoEventMask, a message_type of _NET_SYSTEM_TRAY_OPCODE,
@@ -134,5 +137,7 @@
 /* check if a system tray is already running for the screen */
 gboolean xfce_system_tray_check_running (Screen *screen);
 
+#endif /* !XFCE_DISABLE_DEPRECATED */
+
 G_END_DECLS
 #endif /* !__HAVE_XFCE_SYSTEM_TRAY_H__ */