[planner: 35/61] gantt-header: Port away from GtkObject




commit cd4e259cd5d6db82afe556bbc82f81021c4fa97d
Author: Mart Raudsepp <leio gentoo org>
Date:   Sun Dec 27 16:21:08 2020 +0200

    gantt-header: Port away from GtkObject
    
    The GtkObject::destroy override here did nothing, so just drop it in
    preparation of GTK3 together with other GtkObject usage removals.

 src/planner-gantt-header.c | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/src/planner-gantt-header.c b/src/planner-gantt-header.c
index b1229b4e..9aab127b 100644
--- a/src/planner-gantt-header.c
+++ b/src/planner-gantt-header.c
@@ -83,7 +83,6 @@ static void     gantt_header_get_property        (GObject                 *objec
                                                  guint                    prop_id,
                                                  GValue                  *value,
                                                  GParamSpec              *pspec);
-static void     gantt_header_destroy             (GtkObject               *object);
 static void     gantt_header_map                 (GtkWidget               *widget);
 static void     gantt_header_realize             (GtkWidget               *widget);
 static void     gantt_header_unrealize           (GtkWidget               *widget);
@@ -139,13 +138,11 @@ static void
 gantt_header_class_init (PlannerGanttHeaderClass *class)
 {
        GObjectClass      *o_class;
-       GtkObjectClass    *object_class;
        GtkWidgetClass    *widget_class;
 
        parent_class = g_type_class_peek_parent (class);
 
        o_class = (GObjectClass *) class;
-       object_class = (GtkObjectClass *) class;
        widget_class = (GtkWidgetClass *) class;
 
        /* GObject methods. */
@@ -153,9 +150,6 @@ gantt_header_class_init (PlannerGanttHeaderClass *class)
        o_class->get_property = gantt_header_get_property;
        o_class->finalize = gantt_header_finalize;
 
-       /* GtkObject methods. */
-       object_class->destroy = gantt_header_destroy;
-
        /* GtkWidget methods. */
        widget_class->map = gantt_header_map;;
        widget_class->realize = gantt_header_realize;
@@ -170,7 +164,7 @@ gantt_header_class_init (PlannerGanttHeaderClass *class)
 
        widget_class->set_scroll_adjustments_signal =
                g_signal_new ("set_scroll_adjustments",
-                             G_TYPE_FROM_CLASS (object_class),
+                             G_TYPE_FROM_CLASS (class),
                              G_SIGNAL_RUN_LAST,
                              G_STRUCT_OFFSET (PlannerGanttHeaderClass, set_scroll_adjustments),
                              NULL, NULL,
@@ -384,16 +378,6 @@ gantt_header_finalize (GObject *object)
        }
 }
 
-static void
-gantt_header_destroy (GtkObject *object)
-{
-       /*PlannerGanttHeader *header = PLANNER_GANTT_HEADER (object);*/
-
-       if (GTK_OBJECT_CLASS (parent_class)->destroy) {
-               (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-       }
-}
-
 static void
 gantt_header_map (GtkWidget *widget)
 {
@@ -701,13 +685,12 @@ gantt_header_set_adjustments (PlannerGanttHeader *header,
        }
 
        if (header->priv->hadjustment && (header->priv->hadjustment != hadj)) {
-               gtk_object_unref (GTK_OBJECT (header->priv->hadjustment));
+               g_object_unref (header->priv->hadjustment);
        }
 
        if (header->priv->hadjustment != hadj) {
                header->priv->hadjustment = hadj;
-               gtk_object_ref (GTK_OBJECT (header->priv->hadjustment));
-               gtk_object_sink (GTK_OBJECT (header->priv->hadjustment));
+               g_object_ref_sink (header->priv->hadjustment);
 
                g_signal_connect (hadj,
                                  "value_changed",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]