[libwnck] private: just use DEFAULT_{ICON,MINI_ICON}_SIZE

[Marco Trevisan <marcotrevi src gnome org>]

commit 2142cd2c7714d235975cf1f1b05459becfcdc4bd
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date:   Tue Aug 20 12:47:56 2013 +0200

    private: just use DEFAULT_{ICON,MINI_ICON}_SIZE

 doc/libwnck-sections.txt |    6 ++----
 libwnck/application.c    |    6 +++---
 libwnck/class-group.c    |    8 ++++----
 libwnck/private.h        |    6 ++----
 libwnck/tasklist.c       |    2 +-
 libwnck/window.c         |    6 +++---
 libwnck/xutils.c         |    8 ++++----
 7 files changed, 19 insertions(+), 23 deletions(-)
---
diff --git a/doc/libwnck-sections.txt b/doc/libwnck-sections.txt
index 39c69da..4b39118 100644
--- a/doc/libwnck-sections.txt
+++ b/doc/libwnck-sections.txt
@@ -424,10 +424,8 @@ WnckWorkspaceAccessibleClass
 #<FILE>private</FILE>
 <SUBSECTION Private>
 WNCK_ACTIVATE_TIMEOUT
-DEFAULT_ICON_WIDTH
-DEFAULT_ICON_HEIGHT
-DEFAULT_MINI_ICON_WIDTH
-DEFAULT_MINI_ICON_HEIGHT
+DEFAULT_ICON_SIZE
+DEFAULT_MINI_ICON_SIZE
 WNCK_SCREEN_XSCREEN
 #</SECTION>
 #
diff --git a/libwnck/application.c b/libwnck/application.c
index 3d6a996..56d10f9 100644
--- a/libwnck/application.c
+++ b/libwnck/application.c
@@ -345,10 +345,10 @@ get_icons (WnckApplication *app)
                         app->priv->xwindow,
                         app->priv->icon_cache,
                         &icon,
-                        DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT,
+                        DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE,
                         &mini_icon,
-                        DEFAULT_MINI_ICON_WIDTH,
-                        DEFAULT_MINI_ICON_HEIGHT))
+                        DEFAULT_MINI_ICON_SIZE,
+                        DEFAULT_MINI_ICON_SIZE))
     {
       app->priv->need_emit_icon_changed = TRUE;
       app->priv->icon_from_leader = TRUE;
diff --git a/libwnck/class-group.c b/libwnck/class-group.c
index 5ee2696..f1cd021 100644
--- a/libwnck/class-group.c
+++ b/libwnck/class-group.c
@@ -423,11 +423,11 @@ set_icon (WnckClassGroup *class_group)
   if (!icon || !mini_icon)
     {
       _wnck_get_fallback_icons (&icon,
-                                DEFAULT_ICON_WIDTH,
-                                DEFAULT_ICON_HEIGHT,
+                                DEFAULT_ICON_SIZE,
+                                DEFAULT_ICON_SIZE,
                                 &mini_icon,
-                                DEFAULT_MINI_ICON_WIDTH,
-                                DEFAULT_MINI_ICON_HEIGHT);
+                                DEFAULT_MINI_ICON_SIZE,
+                                DEFAULT_MINI_ICON_SIZE);
       icons_reffed = TRUE;
     }
 
diff --git a/libwnck/private.h b/libwnck/private.h
index ae582f4..250fd24 100644
--- a/libwnck/private.h
+++ b/libwnck/private.h
@@ -115,10 +115,8 @@ gboolean _wnck_workspace_set_viewport (WnckWorkspace *space, int x, int y);
 void _wnck_init (void);
 Display *_wnck_get_default_display (void);
 
-#define DEFAULT_ICON_WIDTH 32
-#define DEFAULT_ICON_HEIGHT 32
-#define DEFAULT_MINI_ICON_WIDTH 16
-#define DEFAULT_MINI_ICON_HEIGHT 16
+#define DEFAULT_ICON_SIZE 32
+#define DEFAULT_MINI_ICON_SIZE 16
 
 #define WNCK_SCREEN_XSCREEN(screen) (_wnck_screen_get_xscreen (screen))
 
diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
index f61d334..1720f4d 100644
--- a/libwnck/tasklist.c
+++ b/libwnck/tasklist.c
@@ -91,7 +91,7 @@ typedef struct _WnckTaskClass   WnckTaskClass;
 
 #define DEFAULT_GROUPING_LIMIT 80
 
-#define MINI_ICON_SIZE DEFAULT_MINI_ICON_WIDTH
+#define MINI_ICON_SIZE DEFAULT_MINI_ICON_SIZE
 #define TASKLIST_BUTTON_PADDING 4
 #define TASKLIST_TEXT_MAX_WIDTH 25 /* maximum width in characters */
 
diff --git a/libwnck/window.c b/libwnck/window.c
index 03cfd43..7d01012 100644
--- a/libwnck/window.c
+++ b/libwnck/window.c
@@ -2108,10 +2108,10 @@ get_icons (WnckWindow *window)
                         window->priv->xwindow,
                         window->priv->icon_cache,
                         &icon,
-                        DEFAULT_ICON_WIDTH, DEFAULT_ICON_HEIGHT,
+                        DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE,
                         &mini_icon,
-                        DEFAULT_MINI_ICON_WIDTH,
-                        DEFAULT_MINI_ICON_HEIGHT))
+                        DEFAULT_MINI_ICON_SIZE,
+                        DEFAULT_MINI_ICON_SIZE))
     {
       window->priv->need_emit_icon_changed = TRUE;
 
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index 0ca3736..90f18ab 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -2303,15 +2303,15 @@ _wnck_get_fallback_icons (GdkPixbuf **iconp,
 {
   if (iconp)
     *iconp = default_icon_at_size (ideal_width > 0 ? ideal_width :
-                                   DEFAULT_ICON_WIDTH,
+                                   DEFAULT_ICON_SIZE,
                                    ideal_height > 0 ? ideal_height :
-                                   DEFAULT_ICON_HEIGHT);
+                                   DEFAULT_ICON_SIZE);
 
   if (mini_iconp)
     *mini_iconp = default_icon_at_size (ideal_mini_width > 0 ? ideal_mini_width :
-                                        DEFAULT_MINI_ICON_WIDTH,
+                                        DEFAULT_MINI_ICON_SIZE,
                                         ideal_mini_height > 0 ? ideal_mini_height :
-                                        DEFAULT_MINI_ICON_HEIGHT);
+                                        DEFAULT_MINI_ICON_SIZE);
 }