Apply a cleanup patch by Kjartan Maraas (#341812)

[~andy/gtk] / gtk / gtkiconfactory.c

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index d89225b51002f2fb2c1073b8e90c260d0f27d80e..0cc2cb1132d6252341ddb34f733ebd786af9af06 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -421,6 +421,7 @@ get_default_icons (GtkIconFactory *factory)
   register_stock_icon (factory, GTK_STOCK_OPEN);
   register_stock_icon (factory, GTK_STOCK_ORIENTATION_PORTRAIT);
   register_stock_icon (factory, GTK_STOCK_ORIENTATION_LANDSCAPE);
+  register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_PORTRAIT);
   register_stock_icon (factory, GTK_STOCK_ORIENTATION_REVERSE_LANDSCAPE);
   register_stock_icon (factory, GTK_STOCK_PASTE);
   register_stock_icon (factory, GTK_STOCK_PREFERENCES);
@@ -1019,7 +1020,7 @@ gtk_icon_size_register_alias (const gchar *alias,
   init_icon_sizes ();
 
   if (!icon_size_lookup_intern (NULL, target, NULL, NULL))
-    g_warning ("gtk_icon_size_register_alias: Icon size %d does not exist", target);
+    g_warning ("gtk_icon_size_register_alias: Icon size %u does not exist", target);
 
   ia = g_hash_table_lookup (icon_aliases, alias);
   if (ia)
@@ -1452,7 +1453,7 @@ render_icon_name_pixbuf (GtkIconSource    *icon_source,
        }
       else
        {
-         g_warning ("Invalid icon size %d\n", size);
+         g_warning ("Invalid icon size %u\n", size);
          width = height = 24;
        }
     }
@@ -1565,9 +1566,13 @@ render_fallback_image (GtkStyle          *style,
 
   if (fallback_source.type == GTK_ICON_SOURCE_EMPTY)
     {
-      GdkPixbuf *pixbuf = _gtk_icon_cache_get_icon (_builtin_cache,
-                                                   GTK_STOCK_MISSING_IMAGE,
-                                                   "24");
+      GdkPixbuf *pixbuf;
+
+      _gtk_icon_theme_ensure_builtin_cache ();
+
+      pixbuf = _gtk_icon_cache_get_icon (_builtin_cache,
+                                        GTK_STOCK_MISSING_IMAGE,
+                                        "24");
       gtk_icon_source_set_pixbuf (&fallback_source, pixbuf);
       g_object_unref (pixbuf);
     }