From 794f0bcc75dbca4090f17e0f3a1f0c08840ef871 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Fri, 24 Jan 2025 02:08:46 +0100
Subject: [PATCH] st/scroll-view: Remove deprecated properties

The `hscroll` and `vscroll` properties were deprecated for GNOME 46.

We usually consider two stable cycles enough of a heads-up, so remove
them for GNOME 48.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3615>
---
 src/st/st-scroll-view.c | 68 -----------------------------------------
 src/st/st-scroll-view.h |  5 ---
 2 files changed, 73 deletions(-)

diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
index 11cf1744f..c5302e379 100644
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@@ -98,8 +98,6 @@ enum {
   PROP_0,
 
   PROP_CHILD,
-  PROP_HSCROLL,
-  PROP_VSCROLL,
   PROP_HADJUSTMENT,
   PROP_VADJUSTMENT,
   PROP_HSCROLLBAR_POLICY,
@@ -128,12 +126,6 @@ st_scroll_view_get_property (GObject    *object,
     case PROP_CHILD:
       g_value_set_object (value, priv->child);
       break;
-    case PROP_HSCROLL:
-      g_value_set_object (value, priv->hscroll);
-      break;
-    case PROP_VSCROLL:
-      g_value_set_object (value, priv->vscroll);
-      break;
     case PROP_HADJUSTMENT:
       g_value_set_object (value, priv->hadjustment);
       break;
@@ -869,26 +861,6 @@ st_scroll_view_class_init (StScrollViewClass *klass)
                          ST_TYPE_SCROLLABLE,
                          ST_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
 
-  /**
-   * StScrollView:hscroll:
-   *
-   * The horizontal #StScrollBar for the #StScrollView.
-   */
-  props[PROP_HSCROLL] =
-    g_param_spec_object ("hscroll", NULL, NULL,
-                         ST_TYPE_SCROLL_BAR,
-                         ST_PARAM_READABLE | G_PARAM_DEPRECATED);
-
-  /**
-   * StScrollView:vscroll:
-   *
-   * The vertical #StScrollBar for the #StScrollView.
-   */
-  props[PROP_VSCROLL] =
-    g_param_spec_object ("vscroll", NULL, NULL,
-                         ST_TYPE_SCROLL_BAR,
-                         ST_PARAM_READABLE | G_PARAM_DEPRECATED);
-
   /**
    * StScrollView:hadjustment:
    *
@@ -1138,46 +1110,6 @@ st_scroll_view_set_child (StScrollView *scroll,
   g_object_thaw_notify (G_OBJECT (scroll));
 }
 
-/**
- * st_scroll_view_get_hscroll_bar:
- * @scroll: a #StScrollView
- *
- * Gets the horizontal #StScrollBar of the #StScrollView.
- *
- * Returns: (transfer none): the horizontal scrollbar
- */
-ClutterActor *
-st_scroll_view_get_hscroll_bar (StScrollView *scroll)
-{
-  StScrollViewPrivate *priv;
-
-  g_return_val_if_fail (ST_IS_SCROLL_VIEW (scroll), NULL);
-
-  priv = st_scroll_view_get_instance_private (scroll);
-
-  return priv->hscroll;
-}
-
-/**
- * st_scroll_view_get_vscroll_bar:
- * @scroll: a #StScrollView
- *
- * Gets the vertical scrollbar of the #StScrollView.
- *
- * Returns: (transfer none): the vertical #StScrollBar
- */
-ClutterActor *
-st_scroll_view_get_vscroll_bar (StScrollView *scroll)
-{
-  StScrollViewPrivate *priv;
-
-  g_return_val_if_fail (ST_IS_SCROLL_VIEW (scroll), NULL);
-
-  priv = st_scroll_view_get_instance_private (scroll);
-
-  return priv->vscroll;
-}
-
 /**
  * st_scroll_view_get_hadjustment:
  * @scroll: a #StScrollView
diff --git a/src/st/st-scroll-view.h b/src/st/st-scroll-view.h
index 64340fbd5..19bae3ebc 100644
--- a/src/st/st-scroll-view.h
+++ b/src/st/st-scroll-view.h
@@ -53,11 +53,6 @@ StScrollable *st_scroll_view_get_child           (StScrollView *scroll);
 void          st_scroll_view_set_child           (StScrollView *scroll,
                                                   StScrollable *child);
 
-G_DEPRECATED
-ClutterActor *st_scroll_view_get_hscroll_bar     (StScrollView *scroll);
-G_DEPRECATED
-ClutterActor *st_scroll_view_get_vscroll_bar     (StScrollView *scroll);
-
 StAdjustment *st_scroll_view_get_hadjustment     (StScrollView *scroll);
 StAdjustment *st_scroll_view_get_vadjustment     (StScrollView *scroll);