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.

8 files changed, 12 insertions, 12 deletions

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 6397537cb..a2aa27469 100644
--- 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 5e8363ffd..3948fb0fd 100644
--- 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 525a731dc..879f44332 100644
--- 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 bc6219ccb..a4e99cbed 100644
--- 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 9fc7f99e7..e7d110af2 100644
--- 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 4b71b5cca..eecd8f1d0 100644
--- 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 43341fec2..e10bc95d4 100644
--- 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 2813e16fd..ee520ba81 100644
--- 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);