From: "Rodolfo García Peñas (kix)" <k...@kix.es>
The function get_window_image_from_x11() is renamed to
get_window_image_from_net_wm_icon because this function gets the
icon from the "NET_WM_ICON" property.
---
src/icon.c | 2 +-
src/wmspec.c | 4 ++--
src/wmspec.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/icon.c b/src/icon.c
index 4306a6e..358fdae 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -676,7 +676,7 @@ static void get_rimage_icon_from_icon_win(WIcon *icon)
RImage *image;
/* Create the new RImage */
- image = get_window_image_from_x11(icon->icon_win);
+ image = get_window_image_from_net_wm_icon(icon->icon_win);
/* Free the icon info */
unset_icon_image(icon);
diff --git a/src/wmspec.c b/src/wmspec.c
index 20a6b5e..8fd91fa 100644
--- a/src/wmspec.c
+++ b/src/wmspec.c
@@ -434,7 +434,7 @@ RImage *get_wwindow_image_from_wm_hints(WWindow *wwin)
return image;
}
-RImage *get_window_image_from_x11(Window window)
+RImage *get_window_image_from_net_wm_icon(Window window)
{
RImage *image;
Atom type;
@@ -478,7 +478,7 @@ static void updateIconImage(WWindow *wwin)
RReleaseImage(wwin->net_icon_image);
/* Save the icon in the X11 icon */
- wwin->net_icon_image = get_window_image_from_x11(wwin->client_win);
+ wwin->net_icon_image =
get_window_image_from_net_wm_icon(wwin->client_win);
/* Refresh the Window Icon */
if (wwin->icon)
diff --git a/src/wmspec.h b/src/wmspec.h
index 5e9d5a3..1630774 100644
--- a/src/wmspec.h
+++ b/src/wmspec.h
@@ -46,5 +46,5 @@ char *wNETWMGetWindowName(Window window);
void wNETFrameExtents(WWindow *wwin);
void wNETCleanupFrameExtents(WWindow *wwin);
RImage *get_wwindow_image_from_wm_hints(WWindow *wwin);
-RImage *get_window_image_from_x11(Window window);
+RImage *get_window_image_from_net_wm_icon(Window window);
#endif
--
1.7.10.4
--
To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.
