Note in docs that @dest can be the same as @src1 or @src2. (#343233,

2006-05-28  Behdad Esfahbod  <behdad@gnome.org>

        * gdk/gdkrectangle.c (gdk_rectangle_union, gdk_rectangle_intersect):
        Note in docs that @dest can be the same as @src1 or @src2. (#343233,
        Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index 1dcf155db062d7176c0dd5db2243d59e0d7c5b24..bb64e106907c985b6071b7513afeb6e3d926abfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-28  Behdad Esfahbod  <behdad@gnome.org>
+
+       * gdk/gdkrectangle.c (gdk_rectangle_union, gdk_rectangle_intersect):
+       Note in docs that @dest can be the same as @src1 or @src2. (#343233,
+       Christian Persch)
+
 2006-05-28  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtkstyle.c (gtk_default_draw_flat_box): handle

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1dcf155db062d7176c0dd5db2243d59e0d7c5b24..bb64e106907c985b6071b7513afeb6e3d926abfe 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-05-28  Behdad Esfahbod  <behdad@gnome.org>
+
+       * gdk/gdkrectangle.c (gdk_rectangle_union, gdk_rectangle_intersect):
+       Note in docs that @dest can be the same as @src1 or @src2. (#343233,
+       Christian Persch)
+
 2006-05-28  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtkstyle.c (gtk_default_draw_flat_box): handle

diff --git a/gdk/gdkrectangle.c b/gdk/gdkrectangle.c
index 427dbfd4911e008ebf8199b02bf5ee0233e3637a..0e13b14bbd46f03a7eb46b88c876f82c3b72d068 100644 (file)
--- a/gdk/gdkrectangle.c
+++ b/gdk/gdkrectangle.c
@@ -37,6 +37,7 @@
  * Calculates the union of two rectangles.
  * The union of rectangles @src1 and @src2 is the smallest rectangle which
  * includes both @src1 and @src2 within it.
+ * It is allowed for @dest to be the same as either @src1 or @src2.
  */
 void
 gdk_rectangle_union (GdkRectangle *src1,
@@ -64,6 +65,7 @@ gdk_rectangle_union (GdkRectangle *src1,
  * @dest: return location for the intersection of @src1 and @src2
  *
  * Calculates the intersection of two rectangles.
+ * It is allowed for @dest to be the same as either @src1 or @src2.
  *
  * Returns: %TRUE if the rectangles intersect.
  */