summaryrefslogtreecommitdiff
path: root/src/core/iconcache.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/iconcache.c')
-rw-r--r--src/core/iconcache.c27
1 files changed, 16 insertions, 11 deletions
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index d4c2f0fd..4dec0049 100644
--- a/src/core/iconcache.c
+++ b/src/core/iconcache.c
@@ -458,17 +458,6 @@ meta_icon_cache_free (MetaIconCache *icon_cache)
icon_cache->origin = USING_NO_ICON;
}
-void
-meta_icon_cache_property_changed (MetaIconCache *icon_cache,
- MetaDisplay *display,
- Atom atom)
-{
- if (atom == display->atom__NET_WM_ICON)
- icon_cache->net_wm_icon_dirty = TRUE;
- else if (atom == XA_WM_HINTS)
- icon_cache->wm_hints_dirty = TRUE;
-}
-
static gboolean
meta_icon_cache_get_icon_invalidated (MetaIconCache *icon_cache)
{
@@ -486,6 +475,22 @@ meta_icon_cache_get_icon_invalidated (MetaIconCache *icon_cache)
return FALSE;
}
+void
+meta_icon_cache_property_changed (MetaIconCache *icon_cache,
+ MetaDisplay *display,
+ Atom atom)
+{
+ if (atom == display->atom__NET_WM_ICON)
+ icon_cache->net_wm_icon_dirty = TRUE;
+ else if (atom == XA_WM_HINTS)
+ icon_cache->wm_hints_dirty = TRUE;
+
+ if (!meta_icon_cache_get_icon_invalidated (icon_cache))
+ return;
+
+ icon_cache->origin = USING_NO_ICON;
+}
+
static GdkPixbuf*
scaled_from_pixdata (guchar *pixdata,
int w,