From: Christian Dywan <christian@twotoasts.de>
Date: Tue, 21 Oct 2008 22:46:53 +0000 (+0200)
Subject: Use fallback stock icon if there is no throbber animation
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53c5bd3c9c3ba975d262d301db2a1df0945bb6e4;p=midori

Use fallback stock icon if there is no throbber animation
---

diff --git a/katze/katze-throbber.c b/katze/katze-throbber.c
index 35396fe5..9977984a 100644
--- a/katze/katze-throbber.c
+++ b/katze/katze-throbber.c
@@ -840,19 +840,27 @@ katze_throbber_expose_event (GtkWidget*      widget,
 
             if (!throbber->pixbuf)
             {
-                g_warning (_("Icon '%s' couldn't be loaded"), throbber->icon_name);
-                katze_assign (throbber->icon_name, NULL);
+                /* Fallback to a stock icon */
+                katze_assign (throbber->icon_name, g_strdup (GTK_STOCK_EXECUTE));
                 g_object_notify (G_OBJECT (throbber), "icon-name");
                 return TRUE;
             }
         }
 
-        if (G_UNLIKELY (!throbber->pixbuf))
-            return TRUE;
-
         gint cols = gdk_pixbuf_get_width (throbber->pixbuf) / throbber->width;
         gint rows = gdk_pixbuf_get_height (throbber->pixbuf) / throbber->height;
 
+        if (G_UNLIKELY (cols == 1 && cols == rows))
+        {
+            gdk_draw_pixbuf (event->window, NULL, throbber->pixbuf,
+                             0, 0,
+                             widget->allocation.x,
+                             widget->allocation.y,
+                             throbber->width, throbber->height,
+                             GDK_RGB_DITHER_NONE, 0, 0);
+            return TRUE;
+        }
+
         if (G_LIKELY (cols > 0 && rows > 0))
         {
             gint index = throbber->index % (cols * rows);