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.

diff --git a/ChangeLog b/ChangeLog
index 5ab5f1013679b658dd581a93cd3d735d2ffe99bb..32a299603e8e63e7cf3e7feba6b8c07fdeb99909 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
 2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
 
        * gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5ab5f1013679b658dd581a93cd3d735d2ffe99bb..32a299603e8e63e7cf3e7feba6b8c07fdeb99909 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+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.
+
 2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
 
        * gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5ab5f1013679b658dd581a93cd3d735d2ffe99bb..32a299603e8e63e7cf3e7feba6b8c07fdeb99909 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+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.
+
 2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
 
        * gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5ab5f1013679b658dd581a93cd3d735d2ffe99bb..32a299603e8e63e7cf3e7feba6b8c07fdeb99909 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+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.
+
 2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
 
        * gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5ab5f1013679b658dd581a93cd3d735d2ffe99bb..32a299603e8e63e7cf3e7feba6b8c07fdeb99909 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+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.
+
 2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
 
        * gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5ab5f1013679b658dd581a93cd3d735d2ffe99bb..32a299603e8e63e7cf3e7feba6b8c07fdeb99909 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+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.
+
 2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
 
        * gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5ab5f1013679b658dd581a93cd3d735d2ffe99bb..32a299603e8e63e7cf3e7feba6b8c07fdeb99909 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+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.
+
 2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
 
        * gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index a9a8d1a4216a449926c342b7aa58cbc19e3729a2..456bfeb3dd353c1fdcfcf395ed25471f456a531e 100644 (file)
--- 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 d4f672a6cfd0d0b700dc2cb959ff567cbb8c12b7..98a4e08c399d4fc8b039edc731ee13245c98c4e2 100644 (file)
--- 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 706de4ec5e15583ebf6179c3555d5050933f0706..09b96e28d3837dca81166f87d93be89e94037f2f 100644 (file)
--- 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 034ca8ef457b4ca09b7d14861a949d1fbc3a18f4..8fbc3b68951391c80f88904082770c0a94438d28 100644 (file)
--- 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 dcfbe11a93e1dc4312f1b358bf069ea3dfe2cd7b..579105672d5c9aa067ecede3ed44b9c417f49cdd 100644 (file)
--- 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>

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 6397537cbe711ed015eb29edb752a831846a1163..a2aa274699604ab592facb571409b44bbede6d73 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -242,7 +242,7 @@ static void gtk_font_selection_get_property (GObject         *object,
       g_value_set_string (value, gtk_font_selection_get_font_name (fontsel));
       break;
     case PROP_FONT:
-      g_value_set_object (value, G_OBJECT (gtk_font_selection_get_font (fontsel)));
+      g_value_set_object (value, gtk_font_selection_get_font (fontsel));
       break;
     case PROP_PREVIEW_TEXT:
       g_value_set_string (value, gtk_font_selection_get_preview_text (fontsel));

diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index 5e8363ffdcfb282ea106259b7fa66e15ca70cd17..3948fb0fd7121adf0c8bdcb8433434fd1b4b1cb4 100644 (file)
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -656,10 +656,10 @@ gtk_layout_get_property (GObject     *object,
   switch (prop_id)
     {
     case PROP_HADJUSTMENT:
-      g_value_set_object (value, G_OBJECT (layout->hadjustment));
+      g_value_set_object (value, layout->hadjustment);
       break;
     case PROP_VADJUSTMENT:
-      g_value_set_object (value, G_OBJECT (layout->vadjustment));
+      g_value_set_object (value, layout->vadjustment);
       break;
     case PROP_WIDTH:
       g_value_set_uint (value, layout->width);

diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
index 525a731dc5468228660c1c1b64b5afaabd960e92..879f44332f524f3537f7f3aa3ce04f5ad5453920 100644 (file)
--- a/gtk/gtkprogressbar.c
+++ b/gtk/gtkprogressbar.c
@@ -284,7 +284,7 @@ gtk_progress_bar_get_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_ADJUSTMENT:
-      g_value_set_object (value, G_OBJECT (GTK_PROGRESS (pbar)->adjustment));
+      g_value_set_object (value, GTK_PROGRESS (pbar)->adjustment);
       break;
     case PROP_ORIENTATION:
       g_value_set_enum (value, pbar->orientation);

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index bc6219ccb3b7842553d235c82ab38fbb01f07f04..a4e99cbed416ab8dc0ce2c52177f9da569c808fe 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -357,7 +357,7 @@ gtk_range_get_property (GObject      *object,
       g_value_set_enum (value, range->update_policy);
       break;
     case PROP_ADJUSTMENT:
-      g_value_set_object (value, G_OBJECT (range->adjustment));
+      g_value_set_object (value, range->adjustment);
       break;
     case PROP_INVERTED:
       g_value_set_boolean (value, range->inverted);

diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 9fc7f99e7417dca9194d4361fd6dce353a7c88ab..e7d110af2fd736fcabc51b50e5fd67eb5743e265 100644 (file)
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -382,7 +382,7 @@ gtk_spin_button_get_property (GObject      *object,
   switch (prop_id)
     {
     case PROP_ADJUSTMENT:
-      g_value_set_object (value, G_OBJECT (spin_button->adjustment));
+      g_value_set_object (value, spin_button->adjustment);
       break;
     case PROP_CLIMB_RATE:
       g_value_set_double (value, spin_button->climb_rate);

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 4b71b5ccaf2a3fe254d56d1e9e2667d7df67090c..eecd8f1d0a0037e7f3376c4c0ff485be4b693c93 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -980,10 +980,10 @@ gtk_tree_view_get_property (GObject    *object,
       g_value_set_object (value, tree_view->priv->model);
       break;
     case PROP_HADJUSTMENT:
-      g_value_set_object (value, G_OBJECT (tree_view->priv->hadjustment));
+      g_value_set_object (value, tree_view->priv->hadjustment);
       break;
     case PROP_VADJUSTMENT:
-      g_value_set_object (value, G_OBJECT (tree_view->priv->vadjustment));
+      g_value_set_object (value, tree_view->priv->vadjustment);
       break;
     case PROP_HEADERS_VISIBLE:
       g_value_set_boolean (value, gtk_tree_view_get_headers_visible (tree_view));

diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 43341fec2d3cf14496f0e1fb0a377ad88cd38242..e10bc95d4d54f1cba9bfdff8674df646033db6a4 100644 (file)
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -200,10 +200,10 @@ gtk_viewport_get_property (GObject         *object,
   switch (prop_id)
     {
     case PROP_HADJUSTMENT:
-      g_value_set_object (value, G_OBJECT (viewport->hadjustment));
+      g_value_set_object (value, viewport->hadjustment);
       break;
     case PROP_VADJUSTMENT:
-      g_value_set_object (value, G_OBJECT (viewport->vadjustment));
+      g_value_set_object (value, viewport->vadjustment);
       break;
     case PROP_SHADOW_TYPE:
       g_value_set_enum (value, viewport->shadow_type);

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 2813e16fdc3e607e69f8afb18b16e304516fd988..ee520ba8142ca89012de725f27b857181931038d 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -1185,7 +1185,7 @@ gtk_widget_get_property (GObject         *object,
       break;
     case PROP_PARENT:
       if (widget->parent)
-       g_value_set_object (value, G_OBJECT (widget->parent));
+       g_value_set_object (value, widget->parent);
       else
        g_value_set_object (value, NULL);
       break;
@@ -1231,7 +1231,7 @@ gtk_widget_get_property (GObject         *object,
       g_value_set_boolean (value, (GTK_WIDGET_COMPOSITE_CHILD (widget) != FALSE));
       break;
     case PROP_STYLE:
-      g_value_set_object (value, G_OBJECT (gtk_widget_get_style (widget)));
+      g_value_set_object (value, gtk_widget_get_style (widget));
       break;
     case PROP_EVENTS:
       eventp = gtk_object_get_data_by_id (GTK_OBJECT (widget), quark_event_mask);