← Back to branch summary

~andrewsomething/ubuntu/lucid/metacity/lp-515682

« back to all changes in this revision

Viewing changes to src/core/iconcache.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-11-07 23:28:05 UTC
  • mfrom: (1.2.47 upstream)
  • Revision ID: james.westby@ubuntu.com-20081107232805-fucpzd207twf72e6
Tags: 1:2.25.5-0ubuntu1
* New upstream release
  - Build-dep on gnome-doc-utils

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/iconcache.c
817
817
  if (icon_cache->want_fallback &&
818
818
      icon_cache->origin < USING_FALLBACK_ICON)
819
819
    {
820
 
      GdkPixbuf *fallback_icon;
821
 
      GdkPixbuf *fallback_mini_icon;
822
 
      
823
 
      fallback_icon = NULL;
824
 
      fallback_mini_icon = NULL;
825
 
 
826
 
      meta_ui_get_fallback_icons(&fallback_icon, &fallback_mini_icon);
827
 
 
828
 
      if (fallback_icon == NULL || fallback_mini_icon == NULL)
829
 
        {
830
 
          get_fallback_icons (screen,
831
 
                              iconp,
832
 
                              ideal_width,
833
 
                              ideal_height,
834
 
                              mini_iconp,
835
 
                              ideal_mini_width,
836
 
                              ideal_mini_height);
837
 
        }
838
 
 
839
 
      if (fallback_icon != NULL)
840
 
        *iconp = fallback_icon;
841
 
      if (fallback_mini_icon != NULL)
842
 
        *mini_iconp = fallback_mini_icon;
843
 
      
 
820
      get_fallback_icons (screen,
 
821
                          iconp,
 
822
                          ideal_width,
 
823
                          ideal_height,
 
824
                          mini_iconp,
 
825
                          ideal_mini_width,
 
826
                          ideal_mini_height);
 
827
 
844
828
      replace_cache (icon_cache, USING_FALLBACK_ICON,
845
829
                     *iconp, *mini_iconp);
846
830