core: Remove useless meta_invalidate_default_icons implementation

This code was supposed to refresh our default icons when the theme
changed, but it actually was a no-op, since the default icons are cached
in a static variable in MetaUI.

I'm not sure the fact that the fallback icons don't update when the
theme changes is an important enough use case to keep working, but I'm
keeping the skeleton function there in case somebody wants to actually
fix it properly.
This commit is contained in:
Jasper St. Pierre 2014-07-14 11:59:42 -04:00
parent 06e4778072
commit df9a5f867f
3 changed files with 3 additions and 23 deletions

View File

@ -495,24 +495,5 @@ meta_core_set_screen_cursor (Display *xdisplay,
void void
meta_invalidate_default_icons (void) meta_invalidate_default_icons (void)
{ {
MetaDisplay *display = meta_get_display (); /* XXX: Actually invalidate the icons when they're used. */
GSList *windows;
GSList *l;
if (display == NULL)
return; /* We can validly be called before the display is opened. */
windows = meta_display_list_windows (display, META_LIST_DEFAULT);
for (l = windows; l != NULL; l = l->next)
{
MetaWindow *window = (MetaWindow*)l->data;
if (window->icon_cache.origin == USING_FALLBACK_ICON)
{
meta_icon_cache_free (&(window->icon_cache));
meta_window_update_icon_now (window);
}
}
g_slist_free (windows);
} }

View File

@ -632,8 +632,6 @@ void meta_window_stack_just_below (MetaWindow *window,
void meta_window_set_user_time (MetaWindow *window, void meta_window_set_user_time (MetaWindow *window,
guint32 timestamp); guint32 timestamp);
void meta_window_update_icon_now (MetaWindow *window);
void meta_window_update_for_monitors_changed (MetaWindow *window); void meta_window_update_for_monitors_changed (MetaWindow *window);
void meta_window_update_on_all_workspaces (MetaWindow *window); void meta_window_update_on_all_workspaces (MetaWindow *window);

View File

@ -117,6 +117,7 @@ static void unminimize_window_and_all_transient_parents (MetaWindow *window);
static void meta_window_propagate_focus_appearance (MetaWindow *window, static void meta_window_propagate_focus_appearance (MetaWindow *window,
gboolean focused); gboolean focused);
static void meta_window_update_icon_now (MetaWindow *window);
/* Idle handlers for the three queues (run with meta_later_add()). The /* Idle handlers for the three queues (run with meta_later_add()). The
* "data" parameter in each case will be a GINT_TO_POINTER of the * "data" parameter in each case will be a GINT_TO_POINTER of the
@ -4822,7 +4823,7 @@ redraw_icon (MetaWindow *window)
meta_ui_queue_frame_draw (window->screen->ui, window->frame->xwindow); meta_ui_queue_frame_draw (window->screen->ui, window->frame->xwindow);
} }
void static void
meta_window_update_icon_now (MetaWindow *window) meta_window_update_icon_now (MetaWindow *window)
{ {
GdkPixbuf *icon; GdkPixbuf *icon;