summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--ChangeLog.pre-2-26
-rw-r--r--ChangeLog.pre-2-46
-rw-r--r--ChangeLog.pre-2-66
-rw-r--r--ChangeLog.pre-2-86
-rw-r--r--contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c2
-rw-r--r--docs/reference/gtk/tmpl/gtkbutton.sgml4
-rw-r--r--docs/reference/gtk/tmpl/gtkcheckbutton.sgml4
-rw-r--r--docs/reference/gtk/tmpl/gtkdialog.sgml4
-rw-r--r--docs/reference/gtk/tmpl/gtkoptionmenu.sgml4
-rw-r--r--docs/reference/gtk/tmpl/gtkrange.sgml12
-rw-r--r--docs/reference/gtk/tmpl/gtkscrollbar.sgml12
-rw-r--r--docs/reference/gtk/tmpl/gtktoolbar.sgml6
-rw-r--r--docs/reference/gtk/tmpl/gtktreeview.sgml8
-rw-r--r--docs/reference/gtk/tmpl/gtkwidget.sgml14
16 files changed, 71 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index fcf8781c94..d25662a948 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+ (xlib_window_is_viewable):
+ Fixed failure of assertion when drawable is root window.
+
Thu Jun 20 19:41:09 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fcf8781c94..d25662a948 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+ (xlib_window_is_viewable):
+ Fixed failure of assertion when drawable is root window.
+
Thu Jun 20 19:41:09 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index fcf8781c94..d25662a948 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+ (xlib_window_is_viewable):
+ Fixed failure of assertion when drawable is root window.
+
Thu Jun 20 19:41:09 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index fcf8781c94..d25662a948 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+ (xlib_window_is_viewable):
+ Fixed failure of assertion when drawable is root window.
+
Thu Jun 20 19:41:09 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fcf8781c94..d25662a948 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+ (xlib_window_is_viewable):
+ Fixed failure of assertion when drawable is root window.
+
Thu Jun 20 19:41:09 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fcf8781c94..d25662a948 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Jul 01 17:19:00 2002 Bill Haneman <bill.haneman@sun.com>
+
+ * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+ (xlib_window_is_viewable):
+ Fixed failure of assertion when drawable is root window.
+
Thu Jun 20 19:41:09 2002 Owen Taylor <otaylor@redhat.com>
* gdk/gdkdisplay.h gdk/gdkscreen.h gdk/**.c gtk/*.c
diff --git a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
index e84d976381..2c8de405a2 100644
--- a/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
+++ b/contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c
@@ -1145,7 +1145,7 @@ xlib_window_is_viewable (Window w)
if (nchildren > 0)
XFree (children);
- if (parent == root)
+ if ((parent == root) || (w == root))
return TRUE;
w = parent;
diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index b67e1009bf..606ca5da9e 100644
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -248,12 +248,12 @@ mouse cursor is.
</para>
-<!-- ##### ARG GtkButton:default-outside-border ##### -->
+<!-- ##### ARG GtkButton:default-border ##### -->
<para>
</para>
-<!-- ##### ARG GtkButton:default-border ##### -->
+<!-- ##### ARG GtkButton:default-outside-border ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
index 9f985152d9..7b5e72c6ad 100644
--- a/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkcheckbutton.sgml
@@ -66,12 +66,12 @@ Creates a new #GtkCheckButton with a #GtkLabel to the right of it.
@Returns:
-<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
+<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
<para>
</para>
-<!-- ##### ARG GtkCheckButton:indicator-size ##### -->
+<!-- ##### ARG GtkCheckButton:indicator-spacing ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtkdialog.sgml b/docs/reference/gtk/tmpl/gtkdialog.sgml
index 978b05e4f7..6a113643a3 100644
--- a/docs/reference/gtk/tmpl/gtkdialog.sgml
+++ b/docs/reference/gtk/tmpl/gtkdialog.sgml
@@ -298,7 +298,7 @@ was clicked.
</para>
-<!-- ##### ARG GtkDialog:action-area-border ##### -->
+<!-- ##### ARG GtkDialog:content-area-border ##### -->
<para>
</para>
@@ -308,7 +308,7 @@ was clicked.
</para>
-<!-- ##### ARG GtkDialog:content-area-border ##### -->
+<!-- ##### ARG GtkDialog:action-area-border ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
index 31debc57f8..876a046a5d 100644
--- a/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
+++ b/docs/reference/gtk/tmpl/gtkoptionmenu.sgml
@@ -100,12 +100,12 @@ selected value for the option menu.
</para>
-<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
+<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
<para>
</para>
-<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
+<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtkrange.sgml b/docs/reference/gtk/tmpl/gtkrange.sgml
index 94b907eb27..3ad1851a33 100644
--- a/docs/reference/gtk/tmpl/gtkrange.sgml
+++ b/docs/reference/gtk/tmpl/gtkrange.sgml
@@ -153,32 +153,32 @@ Emitted when the range value changes.
</para>
-<!-- ##### ARG GtkRange:trough-border ##### -->
+<!-- ##### ARG GtkRange:stepper-spacing ##### -->
<para>
</para>
-<!-- ##### ARG GtkRange:stepper-spacing ##### -->
+<!-- ##### ARG GtkRange:stepper-size ##### -->
<para>
</para>
-<!-- ##### ARG GtkRange:stepper-size ##### -->
+<!-- ##### ARG GtkRange:trough-border ##### -->
<para>
</para>
-<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
+<!-- ##### ARG GtkRange:slider-width ##### -->
<para>
</para>
-<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
+<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
<para>
</para>
-<!-- ##### ARG GtkRange:slider-width ##### -->
+<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtkscrollbar.sgml b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
index fd755020df..65792a700f 100644
--- a/docs/reference/gtk/tmpl/gtkscrollbar.sgml
+++ b/docs/reference/gtk/tmpl/gtkscrollbar.sgml
@@ -54,32 +54,32 @@ The #GtkScrollbar struct does not contain any public data.
</para>
-<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
+<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
<para>
</para>
-<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
<para>
</para>
-<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
<para>
</para>
-<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
<para>
</para>
-<!-- ##### ARG GtkScrollbar:fixed-slider-length ##### -->
+<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
<para>
</para>
-<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
+<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtktoolbar.sgml b/docs/reference/gtk/tmpl/gtktoolbar.sgml
index c996d878e3..71686ff362 100644
--- a/docs/reference/gtk/tmpl/gtktoolbar.sgml
+++ b/docs/reference/gtk/tmpl/gtktoolbar.sgml
@@ -391,7 +391,7 @@ Should be used if you wish to perform an action when ever the style of a toolbar
</para>
-<!-- ##### ARG GtkToolbar:space-size ##### -->
+<!-- ##### ARG GtkToolbar:internal-padding ##### -->
<para>
</para>
@@ -401,12 +401,12 @@ Should be used if you wish to perform an action when ever the style of a toolbar
</para>
-<!-- ##### ARG GtkToolbar:space-style ##### -->
+<!-- ##### ARG GtkToolbar:space-size ##### -->
<para>
</para>
-<!-- ##### ARG GtkToolbar:internal-padding ##### -->
+<!-- ##### ARG GtkToolbar:space-style ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtktreeview.sgml b/docs/reference/gtk/tmpl/gtktreeview.sgml
index be18693948..e96163a6b4 100644
--- a/docs/reference/gtk/tmpl/gtktreeview.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeview.sgml
@@ -901,22 +901,22 @@ Function used for #gtk_tree_view_map_expanded_rows.
</para>
-<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
+<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
<para>
</para>
-<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
+<!-- ##### ARG GtkTreeView:indent-expanders ##### -->
<para>
</para>
-<!-- ##### ARG GtkTreeView:expander-size ##### -->
+<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
<para>
</para>
-<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
+<!-- ##### ARG GtkTreeView:expander-size ##### -->
<para>
</para>
diff --git a/docs/reference/gtk/tmpl/gtkwidget.sgml b/docs/reference/gtk/tmpl/gtkwidget.sgml
index 42b6e26e39..7fde53364c 100644
--- a/docs/reference/gtk/tmpl/gtkwidget.sgml
+++ b/docs/reference/gtk/tmpl/gtkwidget.sgml
@@ -2192,37 +2192,37 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
-<!-- ##### ARG GtkWidget:focus-line-width ##### -->
+<!-- ##### ARG GtkWidget:cursor-color ##### -->
<para>
</para>
-<!-- ##### ARG GtkWidget:interior-focus ##### -->
+<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
<para>
</para>
-<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
+<!-- ##### ARG GtkWidget:focus-line-width ##### -->
<para>
</para>
-<!-- ##### ARG GtkWidget:cursor-color ##### -->
+<!-- ##### ARG GtkWidget:interior-focus ##### -->
<para>
</para>
-<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
+<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
<para>
</para>
-<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
+<!-- ##### ARG GtkWidget:focus-padding ##### -->
<para>
</para>
-<!-- ##### ARG GtkWidget:focus-padding ##### -->
+<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
<para>
</para>
View Lorry Controller Status