[libwnck/gnome-40] Revert "util: move default icon size to WnckHandle"

[Marco Trevisan <marcotrevi src gnome org>]

commit 05f292e4b14558a2106c14924cab685618a198fa
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date:   Thu Feb 17 14:25:59 2022 +0100

    Revert "util: move default icon size to WnckHandle"
    
    This reverts commit 2075df9cc02db6a821cac4fc9c0f15ca90788a6e.

 libwnck/util.c                | 12 ++++++++----
 libwnck/wnck-handle-private.h | 15 ++-------------
 libwnck/wnck-handle.c         | 31 -------------------------------
 3 files changed, 10 insertions(+), 48 deletions(-)
---
diff --git a/libwnck/util.c b/libwnck/util.c
index aea7d269..b3d8750e 100644
--- a/libwnck/util.c
+++ b/libwnck/util.c
@@ -680,6 +680,8 @@ _wnck_get_client_type (void)
   return _wnck_handle_get_client_type (_wnck_get_handle ());
 }
 
+static gsize default_icon_size = WNCK_DEFAULT_ICON_SIZE;
+
 /**
  * wnck_set_default_icon_size:
  * @size: the default size for windows and application standard icons.
@@ -692,15 +694,17 @@ _wnck_get_client_type (void)
 void
 wnck_set_default_icon_size (gsize size)
 {
-  _wnck_handle_set_default_icon_size (_wnck_get_handle (), size);
+  default_icon_size = size;
 }
 
 gsize
 _wnck_get_default_icon_size (void)
 {
-  return _wnck_handle_get_default_icon_size (_wnck_get_handle ());
+  return default_icon_size;
 }
 
+static gsize default_mini_icon_size = WNCK_DEFAULT_MINI_ICON_SIZE;
+
 /**
  * wnck_set_default_mini_icon_size:
  * @size: the default size for windows and application mini icons.
@@ -717,7 +721,7 @@ wnck_set_default_mini_icon_size (gsize size)
   WnckScreen *screen;
   GList *l;
 
-  _wnck_handle_set_default_mini_icon_size (_wnck_get_handle (), size);
+  default_mini_icon_size = size;
 
   default_screen = DefaultScreen (_wnck_get_default_display ());
   screen = _wnck_screen_get_existing (default_screen);
@@ -741,7 +745,7 @@ wnck_set_default_mini_icon_size (gsize size)
 gsize
 _wnck_get_default_mini_icon_size (void)
 {
-  return _wnck_handle_get_default_mini_icon_size (_wnck_get_handle ());
+  return default_mini_icon_size;
 }
 
 /**
diff --git a/libwnck/wnck-handle-private.h b/libwnck/wnck-handle-private.h
index f277661e..2449c741 100644
--- a/libwnck/wnck-handle-private.h
+++ b/libwnck/wnck-handle-private.h
@@ -24,20 +24,9 @@ G_BEGIN_DECLS
 
 typedef struct _WnckHandle WnckHandle;
 
-WnckHandle     *_wnck_handle_new                        (WnckClientType  client_type);
+WnckHandle     *_wnck_handle_new             (WnckClientType  client_type);
 
-WnckClientType  _wnck_handle_get_client_type            (WnckHandle     *self);
-
-void            _wnck_handle_set_default_icon_size      (WnckHandle     *self,
-                                                         gsize           icon_size);
-
-gsize           _wnck_handle_get_default_icon_size      (WnckHandle     *self);
-
-
-void            _wnck_handle_set_default_mini_icon_size (WnckHandle     *self,
-                                                         gsize           icon_size);
-
-gsize           _wnck_handle_get_default_mini_icon_size (WnckHandle     *self);
+WnckClientType  _wnck_handle_get_client_type (WnckHandle     *self);
 
 G_END_DECLS
 
diff --git a/libwnck/wnck-handle.c b/libwnck/wnck-handle.c
index fd617610..cc4771aa 100644
--- a/libwnck/wnck-handle.c
+++ b/libwnck/wnck-handle.c
@@ -28,9 +28,6 @@ struct _WnckHandle
   GObject        parent;
 
   WnckClientType client_type;
-
-  gsize          default_icon_size;
-  gsize          default_mini_icon_size;
 };
 
 enum
@@ -123,8 +120,6 @@ wnck_handle_class_init (WnckHandleClass *self_class)
 static void
 wnck_handle_init (WnckHandle *self)
 {
-  self->default_icon_size = WNCK_DEFAULT_ICON_SIZE;
-  self->default_mini_icon_size = WNCK_DEFAULT_MINI_ICON_SIZE;
 }
 
 WnckHandle
@@ -140,29 +135,3 @@ _wnck_handle_get_client_type (WnckHandle *self)
 {
   return self->client_type;
 }
-
-void
-_wnck_handle_set_default_icon_size (WnckHandle *self,
-                                    gsize       icon_size)
-{
-  self->default_icon_size = icon_size;
-}
-
-gsize
-_wnck_handle_get_default_icon_size (WnckHandle *self)
-{
-  return self->default_icon_size;
-}
-
-void
-_wnck_handle_set_default_mini_icon_size (WnckHandle *self,
-                                         gsize       icon_size)
-{
-  self->default_mini_icon_size = icon_size;
-}
-
-gsize
-_wnck_handle_get_default_mini_icon_size (WnckHandle *self)
-{
-  return self->default_mini_icon_size;
-}