don't cast a possible NULL pointer.

Wed Jan  9 11:23:39 2002  Tim Janik  <timj@gtk.org>

        * gtk/gtklayout.c (gtk_layout_get_property):
        * gtk/gtkspinbutton.c (gtk_spin_button_get_property):
        * gtk/gtktreeview.c (gtk_tree_view_get_property):
        * gtk/gtkwidget.c (gtk_widget_get_property):
        * gtk/gtkfontsel.c (gtk_font_selection_get_property):
        * gtk/gtkrange.c (gtk_range_get_property):
        * gtk/gtkviewport.c (gtk_viewport_get_property):
        * gtk/gtkprogressbar.c (gtk_progress_bar_get_property): don't cast a
        possible NULL pointer.

5 files changed, 67 insertions, 76 deletions

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index a9a8d1a421..456bfeb3dd 100644
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -306,6 +306,14 @@ Get the number of signals defined by this object.
 
 @obj: the object to query.
 
+<!-- ##### MACRO GTK_OBJECT_SET_FLAGS ##### -->
+<para>
+Turns on certain object flags.  (Private)
+</para>
+
+@obj: the object to affect.
+@flag: the flags to set.
+
 <!-- ##### MACRO GTK_OBJECT_SIGNALS ##### -->
 <para>
 Get the array of signals defined for this object.
@@ -313,6 +321,14 @@ Get the array of signals defined for this object.
 
 @obj: the object to fetch the signals from.
 
+<!-- ##### MACRO GTK_OBJECT_UNSET_FLAGS ##### -->
+<para>
+Turns off certain object flags.  (Private)
+</para>
+
+@obj: the object to affect.
+@flag: the flags to unset.
+
 <!-- ##### MACRO GTK_STOCK_BUTTON_APPLY ##### -->
 <para>
 
@@ -2630,6 +2646,51 @@ Sets the function that GTK+ will use to load images
 
 @ruler: the gtkruler
 
+<!-- ##### FUNCTION gtk_selection_clear ##### -->
+<para>
+Internal function.
+</para>
+
+@widget: 
+@event: 
+@Returns: 
+
+<!-- ##### FUNCTION gtk_selection_incr_event ##### -->
+<para>
+Internal function.
+</para>
+
+@window: 
+@event: 
+@Returns: 
+
+<!-- ##### FUNCTION gtk_selection_notify ##### -->
+<para>
+Internal function.
+</para>
+
+@widget: 
+@event: 
+@Returns: 
+
+<!-- ##### FUNCTION gtk_selection_property_notify ##### -->
+<para>
+Internal function.
+</para>
+
+@widget: 
+@event: 
+@Returns: 
+
+<!-- ##### FUNCTION gtk_selection_request ##### -->
+<para>
+Internal function.
+</para>
+
+@widget: 
+@event: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_settings_get_global ##### -->
 <para>
 
diff --git a/docs/reference/gtk/tmpl/gtkdnd.sgml b/docs/reference/gtk/tmpl/gtkdnd.sgml
index d4f672a6cf..98a4e08c39 100644
--- a/docs/reference/gtk/tmpl/gtkdnd.sgml
+++ b/docs/reference/gtk/tmpl/gtkdnd.sgml
@@ -31,16 +31,16 @@ types of action that will be taken on behalf
 of the user for a drag destination site.
 </para>
 
-@GTK_DEST_DEFAULT_MOTION:
+@GTK_DEST_DEFAULT_MOTION: 
    If set for a widget, GTK+, during a drag over this
    widget will check if the drag matches this widget's
    list of possible targets and actions.
    GTK+ will then call gtk_drag_status() as appropriate.
-@GTK_DEST_DEFAULT_HIGHLIGHT:
+@GTK_DEST_DEFAULT_HIGHLIGHT: 
    If set for a widget, GTK+ will draw a highlight on
    this widget as long as a drag is over this widget
    and the widget drag format and action are acceptable.
-@GTK_DEST_DEFAULT_DROP:
+@GTK_DEST_DEFAULT_DROP: 
    If set for a widget, when a drop occurs, GTK+ will
    will check if the drag matches this widget's
    list of possible targets and actions. If so, 
@@ -50,7 +50,7 @@ of the user for a drag destination site.
    was a move, then if the drag was successful, then
    %TRUE will be passed for the @delete parameter
    to gtk_drag_finish().
-@GTK_DEST_DEFAULT_ALL:
+@GTK_DEST_DEFAULT_ALL: 
    If set, specifies that all default actions should
    be taken.
 
@@ -60,13 +60,13 @@ The #GtkTargetFlags enumeration is used to specify
 constraints on an entry in a #GtkTargetTable. 
 </para>
 
-@GTK_TARGET_SAME_APP:
+@GTK_TARGET_SAME_APP: 
    If this is set, the target will only be selected
    for drags within a single application.
  @GTK_TARGET_SAME_WIDGET:
    If this is set, the target will only be selected
    for drags within a single widget.
-
+@GTK_TARGET_SAME_WIDGET: 
 
 <!-- ##### FUNCTION gtk_drag_dest_set ##### -->
 <para>
diff --git a/docs/reference/gtk/tmpl/gtkobject.sgml b/docs/reference/gtk/tmpl/gtkobject.sgml
index 706de4ec5e..09b96e28d3 100644
--- a/docs/reference/gtk/tmpl/gtkobject.sgml
+++ b/docs/reference/gtk/tmpl/gtkobject.sgml
@@ -154,24 +154,6 @@ Tests whether a #GtkObject has had a signal connected to it.
 @obj: the object to examine.
 
 
-<!-- ##### MACRO GTK_OBJECT_SET_FLAGS ##### -->
-<para>
-Turns on certain object flags.  (Private)
-</para>
-
-@obj: the object to affect.
-@flag: the flags to set.
-
-
-<!-- ##### MACRO GTK_OBJECT_UNSET_FLAGS ##### -->
-<para>
-Turns off certain object flags.  (Private)
-</para>
-
-@obj: the object to affect.
-@flag: the flags to unset.
-
-
 <!-- ##### ENUM GtkArgFlags ##### -->
 <para>
 Possible flags indicating how an argument should be treated.
diff --git a/docs/reference/gtk/tmpl/gtkselection.sgml b/docs/reference/gtk/tmpl/gtkselection.sgml
index 034ca8ef45..8fbc3b6895 100644
--- a/docs/reference/gtk/tmpl/gtkselection.sgml
+++ b/docs/reference/gtk/tmpl/gtkselection.sgml
@@ -292,53 +292,3 @@ gtk_selection_data_copy().
 @data: a pointer to a #GtkSelectionData structure.
 
 
-<!-- ##### FUNCTION gtk_selection_clear ##### -->
-<para>
-Internal function.
-</para>
-
-@widget: 
-@event: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_selection_incr_event ##### -->
-<para>
-Internal function.
-</para>
-
-@window: 
-@event: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_selection_notify ##### -->
-<para>
-Internal function.
-</para>
-
-@widget: 
-@event: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_selection_property_notify ##### -->
-<para>
-Internal function.
-</para>
-
-@widget: 
-@event: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_selection_request ##### -->
-<para>
-Internal function.
-</para>
-
-@widget: 
-@event: 
-@Returns: 
-
-
diff --git a/docs/reference/gtk/tmpl/gtksocket.sgml b/docs/reference/gtk/tmpl/gtksocket.sgml
index dcfbe11a93..579105672d 100644
--- a/docs/reference/gtk/tmpl/gtksocket.sgml
+++ b/docs/reference/gtk/tmpl/gtksocket.sgml
@@ -87,8 +87,6 @@ field.  (This field should be considered read-only. It should
 never be set by an application.)
 </para>
 
-@plug_window: the window embedded inside this #GtkSocket.
-
 
 <!-- ##### FUNCTION gtk_socket_new ##### -->
 <para>