From: Rodolfo García Peñas (kix) <kix@kix.es>
Date: Wed, 31 Oct 2012 21:44:23 +0000 (+0100)
Subject: get_pixmap_icon_from_wm_hints uses getSize
X-Git-Tag: wmaker-0.95.4~72
X-Git-Url: https://repo.or.cz/w/wmaker-crm.git/commitdiff_plain/0493974cbcba8b9f648d1c66c7332ca5b29529ed

get_pixmap_icon_from_wm_hints uses getSize

The function get_pixmap_icon_from_wm_hints() now uses getSize() and
the code dup is removed.
---

diff --git a/src/icon.c b/src/icon.c
index db726e47..2f1f07c5 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -728,15 +728,14 @@ static void get_pixmap_icon_from_icon_win(WIcon * icon)
 /* Get the Pixmap from the XWindow wm_hints */
 static int get_pixmap_icon_from_wm_hints(WIcon *icon)
 {
-	Window jw;
 	Pixmap pixmap;
-	unsigned int w, h, ju, d;
-	int ji, x, y;
+	unsigned int w, h, d;
+	int x, y;
 	WWindow *wwin = icon->owner;
 	WScreen *scr = icon->core->screen_ptr;
 	int title_height = WMFontHeight(scr->icon_title_font);
 
-	if (!XGetGeometry(dpy, wwin->wm_hints->icon_pixmap, &jw, &ji, &ji, &w, &h, &ju, &d)) {
+	if (!getSize(wwin->wm_hints->icon_pixmap, &w, &h, &d)) {
 		icon->owner->wm_hints->flags &= ~IconPixmapHint;
 		return 1;
 	}