[libhandy] view-switcher: Drop the icon-size property

[Alexander Mikhaylenko <alexm src gnome org>]

commit 218de1385dd65c7c9ee39c141cfa3fcb8ba83f03
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Wed Aug 5 15:21:29 2020 +0200

    view-switcher: Drop the icon-size property
    
    We don't want to recommend changing it, so let's just not allow do to
    so.
    
    Fixes https://gitlab.gnome.org/GNOME/libhandy/-/issues/159

 debian/libhandy-1-0.symbols    |  2 --
 doc/hdy-migrating-0-0-to-1.xml |  4 +++
 src/hdy-view-switcher.c        | 70 +-----------------------------------------
 src/hdy-view-switcher.h        |  6 ----
 tests/test-view-switcher.c     | 19 ------------
 5 files changed, 5 insertions(+), 96 deletions(-)
---
diff --git a/debian/libhandy-1-0.symbols b/debian/libhandy-1-0.symbols
index f8c9ec25..77c9884c 100644
--- a/debian/libhandy-1-0.symbols
+++ b/debian/libhandy-1-0.symbols
@@ -300,14 +300,12 @@ libhandy-1.so.0 libhandy-1-0 #MINVER#
  hdy_view_switcher_bar_set_policy@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_bar_set_reveal@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_bar_set_stack@LIBHANDY_1_0 0.0.10
- hdy_view_switcher_get_icon_size@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_get_narrow_ellipsize@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_get_policy@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_get_stack@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_get_type@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_new@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_policy_get_type@LIBHANDY_1_0 0.0.10
- hdy_view_switcher_set_icon_size@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_set_narrow_ellipsize@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_set_policy@LIBHANDY_1_0 0.0.10
  hdy_view_switcher_set_stack@LIBHANDY_1_0 0.0.10
diff --git a/doc/hdy-migrating-0-0-to-1.xml b/doc/hdy-migrating-0-0-to-1.xml
index 93b89568..01b53d02 100644
--- a/doc/hdy-migrating-0-0-to-1.xml
+++ b/doc/hdy-migrating-0-0-to-1.xml
@@ -206,6 +206,10 @@
         #HdyViewSwitcher doesn't subclass #GtkBox anymore. Instead, it
         subclasses #GtkBin and contains a box.
       </para>
+      <para>
+        The “icon-size” property has been dropped without replacement, you must
+        stop using it.
+      </para>
     </refsect3>
 
     <refsect3>
diff --git a/src/hdy-view-switcher.c b/src/hdy-view-switcher.c
index 82ddfca1..26c5bcf1 100644
--- a/src/hdy-view-switcher.c
+++ b/src/hdy-view-switcher.c
@@ -53,7 +53,6 @@
 enum {
   PROP_0,
   PROP_POLICY,
-  PROP_ICON_SIZE,
   PROP_NARROW_ELLIPSIZE,
   PROP_STACK,
   LAST_PROP,
@@ -70,7 +69,6 @@ struct _HdyViewSwitcher
   guint switch_timer;
 
   HdyViewSwitcherPolicy policy;
-  GtkIconSize icon_size;
   PangoEllipsizeMode narrow_ellipsize;
   GtkStack *stack;
 };
@@ -106,7 +104,7 @@ update_button (HdyViewSwitcher       *self,
 
   g_object_set (G_OBJECT (button),
                 "icon-name", icon_name,
-                "icon-size", self->icon_size,
+                "icon-size", GTK_ICON_SIZE_BUTTON,
                 "label", title,
                 "needs-attention", needs_attention,
                 NULL);
@@ -227,7 +225,6 @@ add_button_for_stack_child (HdyViewSwitcher *self,
   HdyViewSwitcherButton *button = HDY_VIEW_SWITCHER_BUTTON (hdy_view_switcher_button_new ());
 
   g_object_set_data (G_OBJECT (button), "stack-child", stack_child);
-  g_object_bind_property (self, "icon-size", button, "icon-size", G_BINDING_SYNC_CREATE);
   hdy_view_switcher_button_set_narrow_ellipsize (button, self->narrow_ellipsize);
 
   update_button (self, stack_child, button);
@@ -329,9 +326,6 @@ hdy_view_switcher_get_property (GObject    *object,
   case PROP_POLICY:
     g_value_set_enum (value, hdy_view_switcher_get_policy (self));
     break;
-  case PROP_ICON_SIZE:
-    g_value_set_int (value, hdy_view_switcher_get_icon_size (self));
-    break;
   case PROP_NARROW_ELLIPSIZE:
     g_value_set_enum (value, hdy_view_switcher_get_narrow_ellipsize (self));
     break;
@@ -356,9 +350,6 @@ hdy_view_switcher_set_property (GObject      *object,
   case PROP_POLICY:
     hdy_view_switcher_set_policy (self, g_value_get_enum (value));
     break;
-  case PROP_ICON_SIZE:
-    hdy_view_switcher_set_icon_size (self, g_value_get_int (value));
-    break;
   case PROP_NARROW_ELLIPSIZE:
     hdy_view_switcher_set_narrow_ellipsize (self, g_value_get_enum (value));
     break;
@@ -520,21 +511,6 @@ hdy_view_switcher_class_init (HdyViewSwitcherClass *klass)
                        HDY_TYPE_VIEW_SWITCHER_POLICY, HDY_VIEW_SWITCHER_POLICY_AUTO,
                        G_PARAM_EXPLICIT_NOTIFY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
 
-  /**
-   * HdyViewSwitcher:icon-size:
-   *
-   * Use the "icon-size" property to hint the icons to use, you almost certainly
-   * want to leave this as %GTK_ICON_SIZE_BUTTON.
-   *
-   * Since: 0.0.10
-   */
-  props[PROP_ICON_SIZE] =
-    g_param_spec_int ("icon-size",
-                      _("Icon Size"),
-                      _("Symbolic size to use for named icon"),
-                      0, G_MAXINT, GTK_ICON_SIZE_BUTTON,
-                      G_PARAM_EXPLICIT_NOTIFY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-
   /**
    * HdyViewSwitcher:narrow-ellipsize:
    *
@@ -583,7 +559,6 @@ hdy_view_switcher_init (HdyViewSwitcher *self)
   gtk_box_set_homogeneous (GTK_BOX (self->box), TRUE);
   gtk_container_add (GTK_CONTAINER (self), self->box);
 
-  self->icon_size = GTK_ICON_SIZE_BUTTON;
   self->buttons = g_hash_table_new (g_direct_hash, g_direct_equal);
 
   gtk_widget_set_valign (GTK_WIDGET (self), GTK_ALIGN_FILL);
@@ -650,49 +625,6 @@ hdy_view_switcher_set_policy (HdyViewSwitcher       *self,
   gtk_widget_queue_resize (GTK_WIDGET (self));
 }
 
-/**
- * hdy_view_switcher_get_icon_size:
- * @self: a #HdyViewSwitcher
- *
- * Get the icon size of the images used in the #HdyViewSwitcher.
- *
- * See: hdy_view_switcher_set_icon_size()
- *
- * Returns: the icon size of the images
- *
- * Since: 0.0.10
- */
-GtkIconSize
-hdy_view_switcher_get_icon_size (HdyViewSwitcher *self)
-{
-  g_return_val_if_fail (HDY_IS_VIEW_SWITCHER (self), GTK_ICON_SIZE_BUTTON);
-
-  return self->icon_size;
-}
-
-/**
- * hdy_view_switcher_set_icon_size:
- * @self: a #HdyViewSwitcher
- * @icon_size: the new icon size
- *
- * Change the icon size hint for the icons in a #HdyViewSwitcher.
- *
- * Since: 0.0.10
- */
-void
-hdy_view_switcher_set_icon_size (HdyViewSwitcher *self,
-                                 GtkIconSize      icon_size)
-{
-  g_return_if_fail (HDY_IS_VIEW_SWITCHER (self));
-
-  if (self->icon_size == icon_size)
-    return;
-
-  self->icon_size = icon_size;
-
-  g_object_notify_by_pspec (G_OBJECT (self), props[PROP_ICON_SIZE]);
-}
-
 /**
  * hdy_view_switcher_get_narrow_ellipsize:
  * @self: a #HdyViewSwitcher
diff --git a/src/hdy-view-switcher.h b/src/hdy-view-switcher.h
index 011e485e..3ec02f63 100644
--- a/src/hdy-view-switcher.h
+++ b/src/hdy-view-switcher.h
@@ -37,12 +37,6 @@ HDY_AVAILABLE_IN_ALL
 void                  hdy_view_switcher_set_policy (HdyViewSwitcher       *self,
                                                     HdyViewSwitcherPolicy  policy);
 
-HDY_AVAILABLE_IN_ALL
-GtkIconSize hdy_view_switcher_get_icon_size (HdyViewSwitcher *self);
-HDY_AVAILABLE_IN_ALL
-void        hdy_view_switcher_set_icon_size (HdyViewSwitcher *self,
-                                             GtkIconSize      icon_size);
-
 HDY_AVAILABLE_IN_ALL
 PangoEllipsizeMode hdy_view_switcher_get_narrow_ellipsize (HdyViewSwitcher *self);
 HDY_AVAILABLE_IN_ALL
diff --git a/tests/test-view-switcher.c b/tests/test-view-switcher.c
index caa95ad0..e27e8dfc 100644
--- a/tests/test-view-switcher.c
+++ b/tests/test-view-switcher.c
@@ -29,24 +29,6 @@ test_hdy_view_switcher_policy (void)
 }
 
 
-static void
-test_hdy_view_switcher_icon_size (void)
-{
-  g_autoptr (HdyViewSwitcher) view_switcher = NULL;
-
-  view_switcher = g_object_ref_sink (HDY_VIEW_SWITCHER (hdy_view_switcher_new ()));
-  g_assert_nonnull (view_switcher);
-
-  g_assert_cmpint (hdy_view_switcher_get_icon_size (view_switcher), ==, GTK_ICON_SIZE_BUTTON);
-
-  hdy_view_switcher_set_icon_size (view_switcher, GTK_ICON_SIZE_MENU);
-  g_assert_cmpint (hdy_view_switcher_get_icon_size (view_switcher), ==, GTK_ICON_SIZE_MENU);
-
-  hdy_view_switcher_set_icon_size (view_switcher, GTK_ICON_SIZE_BUTTON);
-  g_assert_cmpint (hdy_view_switcher_get_icon_size (view_switcher), ==, GTK_ICON_SIZE_BUTTON);
-}
-
-
 static void
 test_hdy_view_switcher_narrow_ellipsize (void)
 {
@@ -95,7 +77,6 @@ main (gint argc,
   hdy_init ();
 
   g_test_add_func("/Handy/ViewSwitcher/policy", test_hdy_view_switcher_policy);
-  g_test_add_func("/Handy/ViewSwitcher/icon_size", test_hdy_view_switcher_icon_size);
   g_test_add_func("/Handy/ViewSwitcher/narrow_ellipsize", test_hdy_view_switcher_narrow_ellipsize);
   g_test_add_func("/Handy/ViewSwitcher/stack", test_hdy_view_switcher_stack);