From: "Rodolfo García Peñas (kix)" <[email protected]>
The function get_rimage_icon_from_default_icon() now returns the
RImage instead assign it to the icon file.
This option is better because this function can be used in other
functions to have always image in the icon.
---
src/icon.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/icon.c b/src/icon.c
index d2c8d10..906dbb2 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -63,7 +63,7 @@ static WIcon *icon_create_core(WScreen *scr, int coord_x, int
coord_y);
static void set_dockapp_in_icon(WIcon *icon);
static void get_rimage_icon_from_icon_win(WIcon *icon);
static void get_rimage_icon_from_user_icon(WIcon *icon);
-static void get_rimage_icon_from_default_icon(WIcon *icon);
+static RImage *get_rimage_icon_from_default_icon(WIcon *icon);
static void icon_update_pixmap(WIcon *icon, RImage *image);
static void unset_icon_image(WIcon *icon);
@@ -664,10 +664,13 @@ static void get_rimage_icon_from_user_icon(WIcon *icon)
if (icon->file_image)
return;
- get_rimage_icon_from_default_icon(icon);
+ /* Remove the icon image */
+ unset_icon_image(icon);
+
+ icon->file_image = get_rimage_icon_from_default_icon(icon);
}
-static void get_rimage_icon_from_default_icon(WIcon *icon)
+static RImage *get_rimage_icon_from_default_icon(WIcon *icon)
{
WScreen *scr = icon->core->screen_ptr;
@@ -675,11 +678,8 @@ static void get_rimage_icon_from_default_icon(WIcon *icon)
if (!scr->def_icon_rimage)
scr->def_icon_rimage = get_default_image(scr);
- /* Remove the icon image */
- unset_icon_image(icon);
-
/* Set the new icon image */
- icon->file_image = RRetainImage(scr->def_icon_rimage);
+ return RRetainImage(scr->def_icon_rimage);
}
/* Get the RImage from the WIcon of the WWindow */
--
1.7.10.4
--
To unsubscribe, send mail to [email protected].
