>From ed9ead5a63cd5ef3224608a325584182188c18f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Mon, 19 Nov 2012 01:09:38 +0100
Subject: [PATCH] winspector applySettings uses appicon
applySettings at winspector.c uses the application icon.
This is better than get the icon from X11 function if the icon
doesn't change.
With this change the winspector.c problems go away.
---
src/icon.c | 1 +
src/icon.h | 1 -
src/winspector.c | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/icon.c b/src/icon.c
index 13a0c94..20e6b96 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -65,6 +65,7 @@ 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 void get_rimage_icon_from_x11(WIcon *icon);
+static RImage *get_rimage_icon_from_wm_hints(WIcon *icon);
static void icon_update_pixmap(WIcon *icon, RImage *image);
static void unset_icon_image(WIcon *icon);
diff --git a/src/icon.h b/src/icon.h
index c2a6b09..74e6211 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -66,7 +66,6 @@ void update_icon_pixmap(WIcon *icon);
Bool wIconChangeImageFile(WIcon *icon, char *file);
RImage *wIconValidateIconSize(RImage *icon, int max_size);
-RImage *get_rimage_icon_from_wm_hints(WIcon *icon);
char *wIconStore(WIcon *icon);
char *get_name_for_instance_class(char *wm_instance, char *wm_class);
diff --git a/src/winspector.c b/src/winspector.c
index d3f49d0..7b921e8 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -795,11 +795,11 @@ static void applySettings(WMButton *button,
InspectorPanel *panel)
} else {
/* Change App Icon image */
if (wapp->app_icon)
- wIconUpdate(wapp->app_icon->icon,
get_rimage_icon_from_wm_hints(wapp->app_icon->icon));
+ wIconUpdate(wapp->app_icon->icon,
wapp->app_icon->icon->file_image);
/* Change icon image if the app is minimized */
if (wwin->icon)
- wIconUpdate(wwin->icon,
get_rimage_icon_from_wm_hints(wwin->icon));
+ wIconUpdate(wwin->icon,
wapp->app_icon->icon->file_image);
}
if (file)
--
1.7.10.4
--
||// //\\// Rodolfo "kix" Garcia
||\\// //\\ http://www.kix.es/
>From ed9ead5a63cd5ef3224608a325584182188c18f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?"Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20(kix)"?= <[email protected]>
Date: Mon, 19 Nov 2012 01:09:38 +0100
Subject: [PATCH] winspector applySettings uses appicon
applySettings at winspector.c uses the application icon.
This is better than get the icon from X11 function if the icon
doesn't change.
With this change the winspector.c problems go away.
---
src/icon.c | 1 +
src/icon.h | 1 -
src/winspector.c | 4 ++--
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/icon.c b/src/icon.c
index 13a0c94..20e6b96 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -65,6 +65,7 @@ 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 void get_rimage_icon_from_x11(WIcon *icon);
+static RImage *get_rimage_icon_from_wm_hints(WIcon *icon);
static void icon_update_pixmap(WIcon *icon, RImage *image);
static void unset_icon_image(WIcon *icon);
diff --git a/src/icon.h b/src/icon.h
index c2a6b09..74e6211 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -66,7 +66,6 @@ void update_icon_pixmap(WIcon *icon);
Bool wIconChangeImageFile(WIcon *icon, char *file);
RImage *wIconValidateIconSize(RImage *icon, int max_size);
-RImage *get_rimage_icon_from_wm_hints(WIcon *icon);
char *wIconStore(WIcon *icon);
char *get_name_for_instance_class(char *wm_instance, char *wm_class);
diff --git a/src/winspector.c b/src/winspector.c
index d3f49d0..7b921e8 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -795,11 +795,11 @@ static void applySettings(WMButton *button, InspectorPanel *panel)
} else {
/* Change App Icon image */
if (wapp->app_icon)
- wIconUpdate(wapp->app_icon->icon, get_rimage_icon_from_wm_hints(wapp->app_icon->icon));
+ wIconUpdate(wapp->app_icon->icon, wapp->app_icon->icon->file_image);
/* Change icon image if the app is minimized */
if (wwin->icon)
- wIconUpdate(wwin->icon, get_rimage_icon_from_wm_hints(wwin->icon));
+ wIconUpdate(wwin->icon, wapp->app_icon->icon->file_image);
}
if (file)
--
1.7.10.4
