brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iconcache: Group declarations where they're used

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-07-14 11:29:54 -04:00
parent 92388892b3
commit 06e4778072
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/x11/iconcache.c
View File

@ -653,13 +653,6 @@ meta_read_icons (MetaScreen *screen,
int ideal_mini_width, int ideal_mini_width,
int ideal_mini_height) int ideal_mini_height)
{ {
guchar *pixdata;
int w, h;
guchar *mini_pixdata;
int mini_w, mini_h;
Pixmap pixmap;
Pixmap mask;
/* Return value is whether the icon changed */ /* Return value is whether the icon changed */
g_return_val_if_fail (icon_cache != NULL, FALSE); g_return_val_if_fail (icon_cache != NULL, FALSE);
@ -670,8 +663,6 @@ meta_read_icons (MetaScreen *screen,
if (!meta_icon_cache_get_icon_invalidated (icon_cache)) if (!meta_icon_cache_get_icon_invalidated (icon_cache))
return FALSE; /* we have no new info to use */ return FALSE; /* we have no new info to use */
pixdata = NULL;
/* Our algorithm here assumes that we can't have for example origin /* Our algorithm here assumes that we can't have for example origin
* < USING_NET_WM_ICON and icon_cache->net_wm_icon_dirty == FALSE * < USING_NET_WM_ICON and icon_cache->net_wm_icon_dirty == FALSE
* unless we have tried to read NET_WM_ICON. * unless we have tried to read NET_WM_ICON.
@ -685,6 +676,11 @@ meta_read_icons (MetaScreen *screen,
icon_cache->net_wm_icon_dirty) icon_cache->net_wm_icon_dirty)
{ {
guchar *pixdata;
int w, h;
guchar *mini_pixdata;
int mini_w, mini_h;
icon_cache->net_wm_icon_dirty = FALSE; icon_cache->net_wm_icon_dirty = FALSE;
if (read_rgb_icon (screen->display, xwindow, if (read_rgb_icon (screen->display, xwindow,
@ -717,6 +713,9 @@ meta_read_icons (MetaScreen *screen,
if (icon_cache->origin <= USING_WM_HINTS && if (icon_cache->origin <= USING_WM_HINTS &&
icon_cache->wm_hints_dirty) icon_cache->wm_hints_dirty)
{ {
Pixmap pixmap;
Pixmap mask;
icon_cache->wm_hints_dirty = FALSE; icon_cache->wm_hints_dirty = FALSE;
pixmap = wm_hints_pixmap; pixmap = wm_hints_pixmap;
@ -746,6 +745,9 @@ meta_read_icons (MetaScreen *screen,
if (icon_cache->origin <= USING_KWM_WIN_ICON && if (icon_cache->origin <= USING_KWM_WIN_ICON &&
icon_cache->kwm_win_icon_dirty) icon_cache->kwm_win_icon_dirty)
{ {
Pixmap pixmap;
Pixmap mask;
icon_cache->kwm_win_icon_dirty = FALSE; icon_cache->kwm_win_icon_dirty = FALSE;
get_kwm_win_icon (screen->display, xwindow, &pixmap, &mask); get_kwm_win_icon (screen->display, xwindow, &pixmap, &mask);