gtk+ r21305 - in trunk: . docs/reference docs/reference/gdk/tmpl gdk

[herzi svn gnome org]

Author: herzi
Date: Sat Sep  6 17:26:33 2008
New Revision: 21305
URL: http://svn.gnome.org/viewvc/gtk+?rev=21305&view=rev

Log:
2008-09-06  Sven Herzberg  <sven imendio com>

        Bug 551063 â deprecated marking without a link to what new code should
        use

        * gdk/tmpl/input.sgml: dropped tmpl documentation for gdk_input_add()
        and gdk_input_add_full()
        * gdk/gdkevents.c: added inline documentation for gdk_input_add() and
        gdk_input_add_full(); added replacement hints into the deprecation
        message


Modified:
   trunk/ChangeLog
   trunk/docs/reference/ChangeLog
   trunk/docs/reference/gdk/tmpl/input.sgml
   trunk/gdk/gdkevents.c

Modified: trunk/docs/reference/gdk/tmpl/input.sgml
==============================================================================
--- trunk/docs/reference/gdk/tmpl/input.sgml	(original)
+++ trunk/docs/reference/gdk/tmpl/input.sgml	Sat Sep  6 17:26:33 2008
@@ -35,19 +35,14 @@
 
 
 <!-- ##### FUNCTION gdk_input_add_full ##### -->
-<para>
-Establish a callback when a condition becomes true on
-a file descriptor.
-</para>
 
- source: a file descriptor.
- condition: the condition.
- function: the callback function.
- data: callback data passed to @function.
- destroy: callback function to call with @data when the input
-  handler is removed.
- Returns: a tag that can later be used as an argument to
- gdk_input_remove().
+
+ source: 
+ condition: 
+ function: 
+ data: 
+ destroy: 
+ Returns: 
 
 
 <!-- ##### ENUM GdkInputCondition ##### -->
@@ -88,17 +83,6 @@
 
 
 <!-- ##### FUNCTION gdk_input_add ##### -->
-<para>
-Establish a callback when a condition becomes true on
-a file descriptor.
-</para>
-
- source: a file descriptor.
- condition: the condition.
- function: the callback function.
- data: callback data passed to @function.
- Returns: a tag that can later be used as an argument to
- gdk_input_remove().
 
 
 <!-- ##### FUNCTION gdk_input_remove ##### -->

Modified: trunk/gdk/gdkevents.c
==============================================================================
--- trunk/gdk/gdkevents.c	(original)
+++ trunk/gdk/gdkevents.c	Sat Sep  6 17:26:33 2008
@@ -1015,6 +1015,23 @@
   return TRUE;
 }
 
+/**
+ * gdk_input_add_full:
+ * @source: a file descriptor.
+ * @condition: the condition.
+ * @function: the callback function.
+ * @data: callback data passed to @function.
+ * @destroy: callback function to call with @data when the input
+ * handler is removed.
+ *
+ * Establish a callback when a condition becomes true on
+ * a file descriptor.
+ *
+ * Returns: a tag that can later be used as an argument to
+ * gdk_input_remove().
+ *
+ * Deprecated: Use g_io_add_watch_full() on a #GIOChannel
+ */
 gint
 gdk_input_add_full (gint	      source,
 		    GdkInputCondition condition,
@@ -1048,6 +1065,21 @@
   return result;
 }
 
+/**
+ * gdk_input_add:
+ * @source: a file descriptor.
+ * @condition: the condition.
+ * @function: the callback function.
+ * @data: callback data passed to @function.
+ *
+ * Establish a callback when a condition becomes true on
+ * a file descriptor.
+ *
+ * Returns: a tag that can later be used as an argument to
+ * gdk_input_remove().
+ *
+ * Deprecated: Use g_io_add_watch() on a #GIOChannel
+ */
 gint
 gdk_input_add (gint		 source,
 	       GdkInputCondition condition,