From: "Rodolfo García Peñas (kix)" <[email protected]>
The icon creation for the function icon_create_for_wwindow() is
moved to the new function icon_create_for_wwindow().
No more changes in this commit, only code moving.
---
src/icon.c | 31 +++++++++++++++++++++----------
src/icon.h | 1 +
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/icon.c b/src/icon.c
index ec1db7f..6ef8474 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -111,7 +111,6 @@ WIcon *icon_create_for_wwindow(WWindow *wwin)
{
WScreen *scr = wwin->screen_ptr;
WIcon *icon;
- char *file;
icon = icon_create_core(scr, wwin->icon_x, wwin->icon_y);
@@ -139,17 +138,10 @@ WIcon *icon_create_for_wwindow(WWindow *wwin)
else
wGetIconName(dpy, wwin->client_win, &icon->icon_name);
- /* Get the application icon, default included */
- file = get_icon_filename(scr, wwin->wm_instance, wwin->wm_class, NULL,
True);
- if (file) {
- icon->file = wstrdup(file);
- icon->file_image = get_rimage_from_file(scr, icon->file,
wPreferences.icon_size);
- wfree(file);
- }
-
icon->tile_type = TILE_NORMAL;
- wIconUpdate(icon, NULL);
+ /* Get the application icon, default included */
+ set_icon_for_window(wwin, icon);
WMAddNotificationObserver(appearanceObserver, icon,
WNIconAppearanceSettingsChanged, icon);
WMAddNotificationObserver(tileObserver, icon,
WNIconTileSettingsChanged, icon);
@@ -909,3 +901,22 @@ static void miniwindowMouseDown(WObjDescriptor * desc,
XEvent * event)
}
}
}
+
+void set_icon_for_window(WWindow *wwin, WIcon *icon)
+{
+ WScreen *scr = NULL;
+ char *file = NULL;
+
+ if (!wwin || !icon)
+ return;
+
+ scr = wwin->screen_ptr;
+ file = get_icon_filename(scr, wwin->wm_instance, wwin->wm_class, NULL,
True);
+ if (file) {
+ icon->file = wstrdup(file);
+ icon->file_image = get_rimage_from_file(scr, icon->file,
wPreferences.icon_size);
+ wfree(file);
+ }
+
+ wIconUpdate(icon, NULL);
+}
diff --git a/src/icon.h b/src/icon.h
index 5d2c7d1..abe3038 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -62,6 +62,7 @@ void wIconUpdate(WIcon *icon, RImage *image);
void wIconSelect(WIcon *icon);
void wIconChangeTitle(WIcon *icon, char *new_title);
void update_icon_pixmap(WIcon *icon);
+void set_icon_for_window(WWindow *wwin, WIcon *icon);
Bool wIconChangeImageFile(WIcon *icon, char *file);
--
1.7.10.4
--
To unsubscribe, send mail to [email protected].
